callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of the gimp_export_image() hack and use the new procedure

Browse Source 
2008-08-07  Sven Neumann  <sven@gimp.org>

	* plug-ins/print/print.c (print_image): get rid of the
	gimp_export_image() hack and use the new procedure
	gimp-layer-new-from-visible instead. Finally we can print what 
the
	user sees (including channels).


svn path=/trunk/; revision=26427
This commit is contained in:
Sven Neumann
2008-08-07 19:22:19 +00:00
committed by Sven Neumann
parent 4eb3689b62
commit 25a51b87d6
2 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-08-07 Sven Neumann <sven@gimp.org>
* plug-ins/print/print.c (print_image): get rid of the
gimp_export_image() hack and use the new procedure
gimp-layer-new-from-visible instead. Finally we can print what the
user sees (including channels).
2008-08-07 Sven Neumann <sven@gimp.org> 2008-08-07 Sven Neumann <sven@gimp.org>
* app/core/gimpbuffer.[ch]: added gimp_buffer_get_tiles(). * app/core/gimpbuffer.[ch]: added gimp_buffer_get_tiles().

45
plug-ins/print/print.c
View File

@ -60,7 +60,7 @@ static void begin_print (GtkPrintOperation *operation,
PrintData *data); PrintData *data);
static void end_print (GtkPrintOperation *operation, static void end_print (GtkPrintOperation *operation,
GtkPrintContext *context, GtkPrintContext *context,
gint32 *image_ID); gint32 *layer_ID);
static void draw_page (GtkPrintOperation *print, static void draw_page (GtkPrintOperation *print,
GtkPrintContext *context, GtkPrintContext *context,
gint page_nr, gint page_nr,
@ -189,32 +189,24 @@ print_image (gint32 image_ID,
gboolean interactive) gboolean interactive)
{ {
GtkPrintOperation *operation; GtkPrintOperation *operation;
GError *error = NULL;
gint32 orig_image_ID = image_ID;
gint32 drawable_ID = gimp_image_get_active_drawable (image_ID);
gchar *temp_proc; gchar *temp_proc;
GError *error = NULL;
gint32 layer;
PrintData data; PrintData data;
GimpExportReturn export;
/* export the image */ /* create a print layer from the projection */
export = gimp_export_image (&image_ID, &drawable_ID, NULL, layer = gimp_layer_new_from_visible (image_ID, image_ID, PRINT_PROC_NAME);
GIMP_EXPORT_CAN_HANDLE_RGB |
GIMP_EXPORT_CAN_HANDLE_GRAY |
GIMP_EXPORT_CAN_HANDLE_ALPHA);
if (export == GIMP_EXPORT_CANCEL)
return GIMP_PDB_EXECUTION_ERROR;
operation = gtk_print_operation_new (); operation = gtk_print_operation_new ();
gtk_print_operation_set_n_pages (operation, 1); gtk_print_operation_set_n_pages (operation, 1);
print_operation_set_name (operation, orig_image_ID); print_operation_set_name (operation, image_ID);
print_page_setup_load (operation, orig_image_ID); print_page_setup_load (operation, image_ID);
/* fill in the PrintData struct */ /* fill in the PrintData struct */
data.image_id = orig_image_ID; data.image_id = image_ID;
data.drawable_id = drawable_ID; data.drawable_id = layer;
data.unit = gimp_get_default_unit (); data.unit = gimp_get_default_unit ();
data.image_unit = gimp_image_get_unit (image_ID); data.image_unit = gimp_image_get_unit (image_ID);
data.offset_x = 0; data.offset_x = 0;
@ -227,9 +219,6 @@ print_image (gint32 image_ID,
print_settings_load (&data); print_settings_load (&data);
if (export != GIMP_EXPORT_EXPORT)
image_ID = -1;
gtk_print_operation_set_unit (operation, GTK_UNIT_POINTS); gtk_print_operation_set_unit (operation, GTK_UNIT_POINTS);
g_signal_connect (operation, "begin-print", g_signal_connect (operation, "begin-print",
@ -243,7 +232,7 @@ print_image (gint32 image_ID,
&image_ID); &image_ID);
print_operation = operation; print_operation = operation;
temp_proc = print_temp_proc_install (orig_image_ID); temp_proc = print_temp_proc_install (image_ID);
gimp_extension_enable (); gimp_extension_enable ();
if (interactive) if (interactive)
@ -277,8 +266,8 @@ print_image (gint32 image_ID,
g_object_unref (operation); g_object_unref (operation);
if (gimp_image_is_valid (image_ID)) if (gimp_drawable_is_valid (layer))
gimp_image_delete (image_ID); gimp_drawable_delete (layer);
if (error) if (error)
{ {
@ -377,13 +366,13 @@ begin_print (GtkPrintOperation *operation,
static void static void
end_print (GtkPrintOperation *operation, end_print (GtkPrintOperation *operation,
GtkPrintContext *context, GtkPrintContext *context,
gint32 *image_ID) gint32 *layer_ID)
{ {
/* we don't need the export image any longer, delete it */ /* we don't need the print layer any longer, delete it */
if (gimp_image_is_valid (*image_ID)) if (gimp_drawable_is_valid (*layer_ID))
{ {
gimp_image_delete (*image_ID); gimp_drawable_delete (*layer_ID);
*image_ID = -1; *layer_ID = -1;
} }
gimp_progress_end (); gimp_progress_end ();