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

plug-ins/common/psd.c Made fseek() and ftell() use glong for offsets

Browse Source 
2007-02-03  Mukund Sivaraman  <muks@mukund.org>

        * plug-ins/common/psd.c
        * plug-ins/common/psd_save.c: Made fseek() and ftell() use glong    
        for offsets instead of gint32  


svn path=/trunk/; revision=21840
This commit is contained in:
Mukund Sivaraman
2007-02-03 06:57:38 +00:00
committed by Mukund Sivaraman
parent 766d27da9d
commit 2ea9ad84ef
3 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-02-03 Mukund Sivaraman <muks@mukund.org>
* plug-ins/common/psd.c
* plug-ins/common/psd_save.c: Made fseek() and ftell() use glong
for offsets instead of gint32
2007-02-02 Sven Neumann <sven@gimp.org> 2007-02-02 Sven Neumann <sven@gimp.org>
* app/app_procs.[ch]: renamed to app/app.[ch]. * app/app_procs.[ch]: renamed to app/app.[ch].

8
plug-ins/common/psd.c
View File

@ -1388,7 +1388,7 @@ do_layer_and_mask (FILE *fd)
guint32 offset = 0; guint32 offset = 0;
guint32 Size = PSDheader.miscsizelen; guint32 Size = PSDheader.miscsizelen;
guint32 offset_now = ftell(fd); glong offset_now = ftell (fd);
IFDBG printf ("LAYER AND MASK INFO\n"); IFDBG printf ("LAYER AND MASK INFO\n");
IFDBG printf ("\tSECTION LENGTH: %u\n", Size); IFDBG printf ("\tSECTION LENGTH: %u\n", Size);
@ -2488,7 +2488,7 @@ load_image (const gchar *name)
gimp_displays_flush (); gimp_displays_flush ();
IFDBG printf ("--- %d layers : pos %ld : a-alph %d ---\n", IFDBG printf ("--- %d layers : pos %ld : a-alph %d ---\n",
psd_image.num_layers, (glong) ftell(fd), psd_image.num_layers, ftell (fd),
psd_image.absolute_alpha); psd_image.absolute_alpha);
return image_ID; return image_ID;
@ -2803,7 +2803,7 @@ throwchunk (size_t n,
if (n == 0) if (n == 0)
return; return;
if (fseek (fd, n, SEEK_CUR) != 0) if (fseek (fd, (glong) n, SEEK_CUR) != 0)
{ {
printf ("PSD: unable to seek forward while reading '%s' chunk\n", why); printf ("PSD: unable to seek forward while reading '%s' chunk\n", why);
gimp_quit(); gimp_quit();
@ -2937,7 +2937,7 @@ static void
read_whole_file (FILE *fd) read_whole_file (FILE *fd)
{ {
guint16 w; guint16 w;
gint32 pos; glong pos;
gchar dummy[6]; gchar dummy[6];
gint i; gint i;

36
plug-ins/common/psd_save.c
View File

@ -159,7 +159,7 @@ static void write_gint16 (FILE *fd, gint16 val, gchar *why);
static void write_gint32 (FILE *fd, gint32 val, gchar *why); static void write_gint32 (FILE *fd, gint32 val, gchar *why);
static void write_pixel_data (FILE *fd, gint32 drawableID, static void write_pixel_data (FILE *fd, gint32 drawableID,
gint32 *ChanLenPosition, glong *ChanLenPosition,
gint32 rowlenOffset); gint32 rowlenOffset);
@ -391,7 +391,7 @@ static void
write_gchar (FILE *fd, guchar val, gchar *why) write_gchar (FILE *fd, guchar val, gchar *why)
{ {
unsigned char b[2]; unsigned char b[2];
gint32 pos; glong pos;
b[0] = val; b[0] = val;
b[1] = 0; b[1] = 0;
@ -667,9 +667,9 @@ save_resources (FILE *fd, gint32 image_id)
guint nActiveLayer = 0; /* Number of the active layer */ guint nActiveLayer = 0; /* Number of the active layer */
gboolean ActiveLayerPresent; /* TRUE if there's an active layer */ gboolean ActiveLayerPresent; /* TRUE if there's an active layer */
gint32 eof_pos; /* Position for End of file */ glong eof_pos; /* Position for End of file */
gint32 rsc_pos; /* Position for Lengths of Resources section */ glong rsc_pos; /* Position for Lengths of Resources section */
gint32 name_sec; /* Position for Lengths of Channel Names */ glong name_sec; /* Position for Lengths of Channel Names */
/* Only relevant resources in GIMP are: 0x03EE, 0x03F0 & 0x0400 */ /* Only relevant resources in GIMP are: 0x03EE, 0x03F0 & 0x0400 */
@ -916,18 +916,18 @@ save_layer_and_mask (FILE *fd, gint32 image_id)
gchar *layerName; /* Layer name */ gchar *layerName; /* Layer name */
gint mask; /* Layer mask */ gint mask; /* Layer mask */
gint32 eof_pos; /* Position: End of file */ glong eof_pos; /* Position: End of file */
gint32 ExtraDataPos; /* Position: Extra data length */ glong ExtraDataPos; /* Position: Extra data length */
gint32 LayerMaskPos; /* Position: Layer & Mask section length */ glong LayerMaskPos; /* Position: Layer & Mask section length */
gint32 LayerInfoPos; /* Position: Layer info section length*/ glong LayerInfoPos; /* Position: Layer info section length*/
gint32 **ChannelLengthPos; /* Position: Channel length */ glong **ChannelLengthPos; /* Position: Channel length */
IFDBG printf (" Function: save_layer_and_mask\n"); IFDBG printf (" Function: save_layer_and_mask\n");
/* Create first array dimension (layers, channels) */ /* Create first array dimension (layers, channels) */
ChannelLengthPos = g_new (gint32 *, PSDImageData.nLayers); ChannelLengthPos = g_new (glong *, PSDImageData.nLayers);
/* Layer and mask information section */ /* Layer and mask information section */
@ -983,7 +983,7 @@ save_layer_and_mask (FILE *fd, gint32 image_id)
/* Create second array dimension (layers, channels) */ /* Create second array dimension (layers, channels) */
ChannelLengthPos[i] = g_new (gint32, nChannelsLayer); ChannelLengthPos[i] = g_new (glong, nChannelsLayer);
/* Try with gimp_drawable_bpp() */ /* Try with gimp_drawable_bpp() */
@ -1114,7 +1114,7 @@ save_layer_and_mask (FILE *fd, gint32 image_id)
static void static void
write_pixel_data (FILE *fd, gint32 drawableID, gint32 *ChanLenPosition, write_pixel_data (FILE *fd, gint32 drawableID, glong *ChanLenPosition,
gint32 ltable_offset) gint32 ltable_offset)
{ {
GimpPixelRgn region; /* Image region */ GimpPixelRgn region; /* Image region */
@ -1134,7 +1134,7 @@ write_pixel_data (FILE *fd, gint32 drawableID, gint32 *ChanLenPosition,
gint32 len; /* Length of compressed data */ gint32 len; /* Length of compressed data */
gint16 *LengthsTable; /* Lengths of every compressed row */ gint16 *LengthsTable; /* Lengths of every compressed row */
guchar *rledata; /* Compressed data from a region */ guchar *rledata; /* Compressed data from a region */
gint32 length_table_pos; /* position in file of the length table */ glong length_table_pos; /* position in file of the length table */
int i, j; int i, j;
IFDBG printf (" Function: write_pixel_data, drw %d, lto %d\n", IFDBG printf (" Function: write_pixel_data, drw %d, lto %d\n",
@ -1188,7 +1188,7 @@ write_pixel_data (FILE *fd, gint32 drawableID, gint32 *ChanLenPosition,
xfwrite (fd, LengthsTable, height * sizeof(gint16), xfwrite (fd, LengthsTable, height * sizeof(gint16),
"Dummy RLE length"); "Dummy RLE length");
len += height * sizeof(gint16); len += height * sizeof(gint16);
IF_DEEP_DBG printf ("\t\t\t\t. ltable, pos %d len %d\n", length_table_pos, len); IF_DEEP_DBG printf ("\t\t\t\t. ltable, pos %ld len %d\n", length_table_pos, len);
} }
for (y = 0; y < height; y += tile_height) for (y = 0; y < height; y += tile_height)
@ -1240,7 +1240,7 @@ write_pixel_data (FILE *fd, gint32 drawableID, gint32 *ChanLenPosition,
if (ltable_offset > 0) if (ltable_offset > 0)
{ {
length_table_pos = ltable_offset + 2 * (bytes+1) * height; length_table_pos = ltable_offset + 2 * (bytes+1) * height;
IF_DEEP_DBG printf ("\t\t\t\t. ltable, pos %d\n", length_table_pos); IF_DEEP_DBG printf ("\t\t\t\t. ltable, pos %ld\n", length_table_pos);
} }
else else
{ {
@ -1249,7 +1249,7 @@ write_pixel_data (FILE *fd, gint32 drawableID, gint32 *ChanLenPosition,
xfwrite (fd, LengthsTable, height * sizeof(gint16), xfwrite (fd, LengthsTable, height * sizeof(gint16),
"Dummy RLE length"); "Dummy RLE length");
len += height * sizeof(gint16); len += height * sizeof(gint16);
IF_DEEP_DBG printf ("\t\t\t\t. ltable, pos %d len %d\n", length_table_pos, len); IF_DEEP_DBG printf ("\t\t\t\t. ltable, pos %ld len %d\n", length_table_pos, len);
} }
for (y = 0; y < height; y += tile_height) for (y = 0; y < height; y += tile_height)
@ -1304,7 +1304,7 @@ save_data (FILE *fd, gint32 image_id)
gint i, j; gint i, j;
gint nChannel; gint nChannel;
gint32 imageHeight; /* Height of image */ gint32 imageHeight; /* Height of image */
gint32 offset; /* offset in file of rle lengths */ glong offset; /* offset in file of rle lengths */
gint chan; gint chan;
gint32 bottom_layer; gint32 bottom_layer;