Browse Source
gis/xplanet: Updated for version 1.3.1.
gis/xplanet: Updated for version 1.3.1.
Signed-off-by: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>pull/28/head
committed by
Willy Sudiarto Raharjo
No known key found for this signature in database
GPG Key ID: 887B8374D7333381
3 changed files with 25 additions and 136 deletions
@ -1,141 +1,30 @@ |
|||
diff -wbBur xplanet-1.3.0/src/libimage/gif.c xplanet-1.3.0.my/src/libimage/gif.c
|
|||
--- xplanet-1.3.0/src/libimage/gif.c 2006-03-26 01:50:51.000000000 +0300
|
|||
+++ xplanet-1.3.0.my/src/libimage/gif.c 2014-05-29 18:59:14.830652716 +0400
|
|||
@@ -20,7 +20,7 @@
|
|||
|
|||
#include <stdio.h> |
|||
#include <stdlib.h> |
|||
-
|
|||
+#define FALSE 0
|
|||
#include <gif_lib.h> |
|||
|
|||
/* |
|||
@@ -42,11 +42,11 @@
|
|||
int color_index; |
|||
unsigned char *ptr = NULL; |
|||
|
|||
- infile = DGifOpenFileName(filename);
|
|||
+ infile = DGifOpenFileName(filename, NULL);
|
|||
|
|||
if (infile == NULL) |
|||
{ |
|||
- PrintGifError();
|
|||
+ printf("%s\n", GifErrorString(GIF_ERROR));
|
|||
return(0); |
|||
diff -wbBur xplanet-1.3.1/src/libimage/gif.c xplanet-1.3.1.q/src/libimage/gif.c
|
|||
--- xplanet-1.3.1/src/libimage/gif.c 2013-02-16 23:37:47.000000000 +0400
|
|||
+++ xplanet-1.3.1.q/src/libimage/gif.c 2016-03-14 17:41:14.244144734 +0300
|
|||
@@ -179,7 +179,7 @@
|
|||
} |
|||
} |
|||
|
|||
@@ -54,7 +54,7 @@
|
|||
{ |
|||
if (DGifGetRecordType(infile, &record_type) == GIF_ERROR) |
|||
{ |
|||
- PrintGifError();
|
|||
+ printf("%s\n", GifErrorString(GIF_ERROR));
|
|||
return(0); |
|||
} |
|||
|
|||
@@ -63,7 +63,7 @@
|
|||
case IMAGE_DESC_RECORD_TYPE: |
|||
if (DGifGetImageDesc(infile) == GIF_ERROR) |
|||
{ |
|||
- PrintGifError();
|
|||
+ printf("%s\n", GifErrorString(GIF_ERROR));
|
|||
return(0); |
|||
} |
|||
|
|||
@@ -107,14 +107,14 @@
|
|||
GifByteType *ext; |
|||
if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR) |
|||
{ |
|||
- PrintGifError();
|
|||
+ printf("%s\n", GifErrorString(GIF_ERROR));
|
|||
return(0); |
|||
} |
|||
while (ext != NULL) |
|||
{ |
|||
if (DGifGetExtensionNext(infile, &ext) == GIF_ERROR) |
|||
{ |
|||
- PrintGifError();
|
|||
+ printf("%s\n", GifErrorString(GIF_ERROR));
|
|||
return(0); |
|||
} |
|||
} |
|||
@@ -154,7 +154,7 @@
|
|||
|
|||
free(buffer); |
|||
|
|||
- DGifCloseFile(infile);
|
|||
+ DGifCloseFile(infile, NULL);
|
|||
return(1); |
|||
} |
|||
|
|||
@@ -178,7 +178,7 @@
|
|||
return(0); |
|||
- if (DGifCloseFile(GifFile) == GIF_ERROR) {
|
|||
+ if (DGifCloseFile(GifFile, NULL) == GIF_ERROR) {
|
|||
return(0); |
|||
} |
|||
|
|||
- colormap = MakeMapObject(colormap_size, NULL);
|
|||
+ colormap = GifMakeMapObject(colormap_size, NULL);
|
|||
|
|||
for (i = 0; i < width * height; i++) |
|||
{ |
|||
@@ -187,10 +187,10 @@
|
|||
blue[i] = (GifByteType) rgb[3*i+2]; |
|||
} |
|||
|
|||
- if (QuantizeBuffer(width, height, &colormap_size, red, green, blue,
|
|||
+ if (GifQuantizeBuffer(width, height, &colormap_size, red, green, blue,
|
|||
buffer, colormap->Colors) == GIF_ERROR) |
|||
{ |
|||
- PrintGifError();
|
|||
+ printf("%s\n", GifErrorString(GIF_ERROR));
|
|||
return(0); |
|||
} |
|||
|
|||
@@ -198,24 +198,24 @@
|
|||
free(green); |
|||
free(blue); |
|||
|
|||
- outfile = EGifOpenFileName((char *) filename, FALSE);
|
|||
+ outfile = EGifOpenFileName((char *) filename, FALSE, NULL);
|
|||
if (outfile == NULL) |
|||
{ |
|||
- PrintGifError();
|
|||
+ printf("%s\n", GifErrorString(GIF_ERROR));
|
|||
return(0); |
|||
} |
|||
@@ -493,7 +493,7 @@
|
|||
static void QuitGifError(GifFileType *GifFile) |
|||
{ |
|||
fprintf(stderr, "Error writing GIF file\n"); |
|||
- if (GifFile != NULL) EGifCloseFile(GifFile);
|
|||
+ if (GifFile != NULL) EGifCloseFile(GifFile, NULL);
|
|||
} |
|||
|
|||
if (EGifPutScreenDesc(outfile, width, height, colormap_size, 0, colormap) |
|||
== GIF_ERROR) |
|||
{ |
|||
- PrintGifError();
|
|||
+ printf("%s\n", GifErrorString(GIF_ERROR));
|
|||
return(0); |
|||
int |
|||
@@ -589,7 +589,7 @@
|
|||
Ptr += width; |
|||
} |
|||
|
|||
if (EGifPutImageDesc(outfile, 0, 0, width, height, FALSE, NULL) |
|||
== GIF_ERROR) |
|||
{ |
|||
- PrintGifError();
|
|||
+ printf("%s\n", GifErrorString(GIF_ERROR));
|
|||
return(0); |
|||
} |
|||
- if (EGifCloseFile(GifFile) == GIF_ERROR)
|
|||
+ if (EGifCloseFile(GifFile, NULL) == GIF_ERROR)
|
|||
|
|||
@@ -224,7 +224,7 @@
|
|||
{ |
|||
if (EGifPutLine(outfile, ptr, width) == GIF_ERROR) |
|||
{ |
|||
- PrintGifError();
|
|||
+ printf("%s\n", GifErrorString(GIF_ERROR));
|
|||
return(0); |
|||
} |
|||
ptr += width; |
|||
@@ -232,8 +232,8 @@
|
|||
|
|||
EGifSpew(outfile); |
|||
|
|||
- if (EGifCloseFile(outfile) == GIF_ERROR)
|
|||
- PrintGifError();
|
|||
+ if (EGifCloseFile(outfile, NULL) == GIF_ERROR)
|
|||
+ printf("%s\n", GifErrorString(GIF_ERROR));
|
|||
|
|||
free(buffer); |
|||
|
|||
QuitGifError(GifFile); |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue