summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--base/claptrap-planar.c2
-rw-r--r--base/gp_unifs.c21
-rw-r--r--base/gxclpath.c1
-rw-r--r--gpdl/tifftop.c1
4 files changed, 12 insertions, 13 deletions
diff --git a/base/claptrap-planar.c b/base/claptrap-planar.c
index 46863654f..9b06b1844 100644
--- a/base/claptrap-planar.c
+++ b/base/claptrap-planar.c
@@ -43,7 +43,9 @@ inline static void process_at_pixel(ClapTrap * gs_restrict ct,
43 /* Use local vars to avoid pointer aliasing */ 43 /* Use local vars to avoid pointer aliasing */
44 int width = ct->width; 44 int width = ct->width;
45 int height = ct->height; 45 int height = ct->height;
46#ifndef NDEBUG
46 int num_comp_lim = ct->num_comps; 47 int num_comp_lim = ct->num_comps;
48#endif
47 int max_x_offset = ct->max_x_offset; 49 int max_x_offset = ct->max_x_offset;
48 int max_y_offset = ct->max_y_offset; 50 int max_y_offset = ct->max_y_offset;
49 int span = ct->span; 51 int span = ct->span;
diff --git a/base/gp_unifs.c b/base/gp_unifs.c
index 5ded2059b..70752634c 100644
--- a/base/gp_unifs.c
+++ b/base/gp_unifs.c
@@ -195,16 +195,16 @@ int gp_pread_impl(char *buf, size_t count, gs_offset_t offset, FILE *f)
195 int c; 195 int c;
196 int64_t os, curroff = gp_ftell_impl(f); 196 int64_t os, curroff = gp_ftell_impl(f);
197 if (curroff < 0) return curroff; 197 if (curroff < 0) return curroff;
198 198
199 os = gp_fseek_impl(f, offset, 0); 199 os = gp_fseek_impl(f, offset, 0);
200 if (os < 0) return os; 200 if (os < 0) return os;
201 201
202 c = fread(buf, 1, count, f); 202 c = fread(buf, 1, count, f);
203 if (c < 0) return c; 203 if (c < 0) return c;
204 204
205 os = gp_fseek_impl(f, curroff, 0); 205 os = gp_fseek_impl(f, curroff, 0);
206 if (os < 0) return os; 206 if (os < 0) return os;
207 207
208 return c; 208 return c;
209#endif 209#endif
210} 210}
@@ -219,16 +219,16 @@ int gp_pwrite_impl(const char *buf, size_t count, gs_offset_t offset, FILE *f)
219 int c; 219 int c;
220 int64_t os, curroff = gp_ftell_impl(f); 220 int64_t os, curroff = gp_ftell_impl(f);
221 if (curroff < 0) return curroff; 221 if (curroff < 0) return curroff;
222 222
223 os = gp_fseek_impl(f, offset, 0); 223 os = gp_fseek_impl(f, offset, 0);
224 if (os < 0) return os; 224 if (os < 0) return os;
225 225
226 c = fwrite(buf, 1, count, f); 226 c = fwrite(buf, 1, count, f);
227 if (c < 0) return c; 227 if (c < 0) return c;
228 228
229 os = gp_fseek_impl(f, curroff, 0); 229 os = gp_fseek_impl(f, curroff, 0);
230 if (os < 0) return os; 230 if (os < 0) return os;
231 231
232 return c; 232 return c;
233#endif 233#endif
234} 234}
@@ -438,7 +438,6 @@ gp_enumerate_files_next_impl(gs_memory_t * mem, file_enum * pfen, char *ptr, uin
438 char *pattern = pfen->pattern; 438 char *pattern = pfen->pattern;
439 int pathead = pfen->pathead; 439 int pathead = pfen->pathead;
440 int len; 440 int len;
441 struct stat stbuf;
442 441
443 if (pfen->first_time) { 442 if (pfen->first_time) {
444 pfen->dirp = ((worklen == 0) ? opendir(".") : opendir(work)); 443 pfen->dirp = ((worklen == 0) ? opendir(".") : opendir(work));
@@ -636,11 +635,11 @@ bool gp_fseekable_impl(FILE *f)
636{ 635{
637 struct stat s; 636 struct stat s;
638 int fno; 637 int fno;
639 638
640 fno = fileno(f); 639 fno = fileno(f);
641 if (fno < 0) 640 if (fno < 0)
642 return(false); 641 return(false);
643 642
644 if (fstat(fno, &s) < 0) 643 if (fstat(fno, &s) < 0)
645 return(false); 644 return(false);
646 645
diff --git a/base/gxclpath.c b/base/gxclpath.c
index f341b6c15..9a57932e3 100644
--- a/base/gxclpath.c
+++ b/base/gxclpath.c
@@ -1026,7 +1026,6 @@ clist_fill_stroke_path(gx_device * pdev, const gs_gstate * pgs,
1026 RECT_ENUM_INIT(re, ry, rheight); 1026 RECT_ENUM_INIT(re, ry, rheight);
1027 do { 1027 do {
1028 int code; 1028 int code;
1029 fixed ymin, ymax;
1030 1029
1031 RECT_STEP_INIT(re); 1030 RECT_STEP_INIT(re);
1032 if ((code = cmd_do_write_unknown(cdev, re.pcls, STROKE_ALL_KNOWN | FILL_KNOWN)) < 0) 1031 if ((code = cmd_do_write_unknown(cdev, re.pcls, STROKE_ALL_KNOWN | FILL_KNOWN)) < 0)
diff --git a/gpdl/tifftop.c b/gpdl/tifftop.c
index d12a44ba4..16939dbb5 100644
--- a/gpdl/tifftop.c
+++ b/gpdl/tifftop.c
@@ -595,7 +595,6 @@ do_impl_process(pl_interp_implementation_t * impl, stream_cursor_read * pr, int
595 gs_string plane_data[GS_IMAGE_MAX_COMPONENTS]; 595 gs_string plane_data[GS_IMAGE_MAX_COMPONENTS];
596 int invert = 0; 596 int invert = 0;
597 int alpha = 0; 597 int alpha = 0;
598 char emsg[1024];
599 598
600 tiff->handle = TIFFClientOpen("dummy", "rm", 599 tiff->handle = TIFFClientOpen("dummy", "rm",
601 (thandle_t)tiff, 600 (thandle_t)tiff,