graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-22 12:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bill Skaggs <weskaggs@primate.ucdavis.edu>

Browse source 
* plug-ins/jpeg/gimpexif.c
	* plug-ins/jpeg/jpeg-load.c
	* plug-ins/jpeg/jpeg-save.h
	* plug-ins/jpeg/jpeg.c
	* plug-ins/jpeg/jpeg.h: fix multiply-defined linker symbols;
	fixes bug #342456.
This commit is contained in:
William Skaggs 2006-05-24 20:16:25 +00:00
parent 6416b18a65
commit 74c19c8dc7
6 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2006-05-24 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* plug-ins/jpeg/gimpexif.c
* plug-ins/jpeg/jpeg-load.c
* plug-ins/jpeg/jpeg-save.h
* plug-ins/jpeg/jpeg.c
* plug-ins/jpeg/jpeg.h: fix multiply-defined linker symbols;
fixes bug #342456.
2006-05-24 Michael Natterer <mitch@gimp.org>
* plug-ins/script-fu/scripts/copy-visible.scm: use canonical

2
plug-ins/jpeg/gimpexif.c
View file

@ -34,6 +34,8 @@
#include "gimpexif.h"
ExifData *exif_data;
/*
* gimp_metadata_store_exif:
* @image_ID: the GIMP image to work on.

3
plug-ins/jpeg/jpeg-load.c
View file

@ -40,6 +40,9 @@
#include "jpeg-icc.h"
#include "jpeg-load.h"
gint32 volatile image_ID_global;
GimpDrawable *drawable_global;
gint32 layer_ID_global;
gint32
load_image (const gchar *filename,

6
plug-ins/jpeg/jpeg-save.h
View file

@ -48,10 +48,10 @@ typedef struct
gboolean save_xmp;
} JpegSaveVals;
JpegSaveVals jsvals;
extern JpegSaveVals jsvals;
gint32 orig_image_ID_global;
gint32 drawable_ID_global;
extern gint32 orig_image_ID_global;
extern gint32 drawable_ID_global;
gboolean save_image (const gchar *filename,
gint32 image_ID,

7
plug-ins/jpeg/jpeg.c
View file

@ -50,6 +50,13 @@ static void run (const gchar *name,
gint *nreturn_vals,
GimpParam **return_vals);
gboolean undo_touched;
gboolean load_interactive;
gchar *image_comment;
gint32 display_ID;
JpegSaveVals jsvals;
gint32 orig_image_ID_global;
gint32 drawable_ID_global;
const GimpPlugInInfo PLUG_IN_INFO =
{

16
plug-ins/jpeg/jpeg.h
View file

@ -41,13 +41,13 @@ typedef struct my_error_mgr
} *my_error_ptr;
gint32 volatile image_ID_global;
gint32 layer_ID_global;
GimpDrawable *drawable_global;
gboolean undo_touched;
gboolean load_interactive;
gint32 display_ID;
gchar *image_comment;
extern gint32 volatile image_ID_global;
extern gint32 layer_ID_global;
extern GimpDrawable *drawable_global;
extern gboolean undo_touched;
extern gboolean load_interactive;
extern gint32 display_ID;
extern gchar *image_comment;
gint32 load_image (const gchar *filename,
GimpRunMode runmode,
@ -62,7 +62,7 @@ void my_output_message (j_common_ptr cinfo);
#ifdef HAVE_EXIF
ExifData *exif_data;
extern ExifData *exif_data;
gint32 load_thumbnail_image (const gchar *filename,
gint *width,