Skip to content
Browse files

- prevent a cast to integer warning on x64 builds in datatypes.c

   also fixed some other type warnings
  • Loading branch information...
1 parent e7ac18b commit 8a2cd317acbc6fbc8fa35d8df72b01f7ce73bca2 Tony Cook committed Oct 26, 2007
Showing with 23 additions and 8 deletions.
  1. +6 −0 Changes
  2. +2 −0 TODO
  3. +6 −2 datatypes.c
  4. +2 −1 dynfilt/dt2.c
  5. +2 −1 dynfilt/dyntest.c
  6. +3 −2 dynfilt/flines.c
  7. +2 −2 dynfilt/mandelbrot.c
View
6 Changes
@@ -7,10 +7,16 @@ Imager 0.61 - unreleased
when scaling an animated gif
http://rt.cpan.org/Ticket/Display.html?id=27591
+Bug fixes:
+
- correct handling of sz in matrix_transform() - this should allow
perspective type transformations to work now.
http://rt.cpan.org/Ticket/Display.html?id=29936
+ - prevent a cast to integer warning on x64 builds in datatypes.c
+ also fixed some other type warnings
+ https://rt.cpan.org/Ticket/Display.html?id=30204
+
Imager 0.60 - 30 August 2007
===========
View
2 TODO
@@ -57,6 +57,8 @@ CMYK alpha TIFF problems with old libtiff (#29353) (done)
matrix_transform() should use fabs() instead of abs() range checking
sz (#29936) (done)
+warning compiling datatypes.c on x64 (#30204) (done)
+
For 0.60 (hopefully):
RGB file support (#8666) (done)
View
8 datatypes.c
@@ -248,8 +248,12 @@ void
octt_dump(struct octt *ct) {
int i;
/* printf("node [0x%08X] -> (%d)\n",ct,ct->cnt); */
- for(i=0;i<8;i++) if (ct->t[i] != NULL) printf("[ %d ] -> 0x%08X\n",i,(unsigned int)ct->t[i]);
- for(i=0;i<8;i++) if (ct->t[i] != NULL) octt_dump(ct->t[i]);
+ for(i=0;i<8;i++)
+ if (ct->t[i] != NULL)
+ printf("[ %d ] -> %p\n", i, (void *)ct->t[i]);
+ for(i=0;i<8;i++)
+ if (ct->t[i] != NULL)
+ octt_dump(ct->t[i]);
}
/* note that all calls of octt_count are operating on the same overflow
View
3 dynfilt/dt2.c
@@ -23,7 +23,8 @@ html_art(void *INP) {
printf("parameters: (im 0x%p,fname %s)\n",im,fname);
- printf("image info:\n size (%d,%d)\n channels (%d)\n channel mask (%d)\n bytes (%d)\n",im->xsize,im->ysize,im->channels,im->ch_mask,im->bytes);
+ printf("image info:\n size (%d,%d)\n channels (%d)\n",
+ im->xsize,im->ysize,im->channels);
fp=fopen(fname,"ab+");
fprintf(fp,"<TABLE BORDER=\"0\" CELLPADDING=\"0\" CELLSPACING=\"0\">");
View
3 dynfilt/dyntest.c
@@ -44,7 +44,8 @@ void lin_stretch(void *INP) {
i_img_info(im,info);
for(i=0;i<4;i++) { printf("%d: %d\n",i,info[i]); }
- printf("image info:\n size (%d,%d)\n channels (%d)\n channel mask (%d)\n bytes (%d)\n",im->xsize,im->ysize,im->channels,im->ch_mask,im->bytes);
+ printf("image info:\n size (%d,%d)\n channels (%d)\n",
+ im->xsize, im->ysize, im->channels);
for(y=0;y<im->ysize;y++) for(x=0;x<im->xsize;x++) {
i_gpix(im,x,y,&rcolor);
View
5 dynfilt/flines.c
@@ -30,8 +30,9 @@ flines(void *INP) {
return;
}
- fprintf(stderr, "flines: parameters: (im 0x%x)\n",im);
- fprintf(stderr, "flines: image info:\n size (%d,%d)\n channels (%d)\n channel mask (%d)\n bytes (%d)\n",im->xsize,im->ysize,im->channels,im->ch_mask,im->bytes);
+ fprintf(stderr, "flines: parameters: (im %p)\n",im);
+ fprintf(stderr, "flines: image info:\n size (%d,%d)\n channels (%d)\n",
+ im->xsize,im->ysize,im->channels);
for(y = 0; y < im->ysize; y ++) {
for(x = 0; x < im->xsize; x ++ ) {
View
4 dynfilt/mandelbrot.c
@@ -40,7 +40,6 @@ mandel(float x, float y) {
void mandlebrot(void *INP) {
i_img *im;
- i_color vl;
int i,bytes,x,y;
int idx;
@@ -66,7 +65,8 @@ void mandlebrot(void *INP) {
fprintf(stderr,"mandlebrot: parameters: (im %p)\n",im);
bytes=im->bytes;
- fprintf(stderr, "mandlebrot: image info:\n size (%d,%d)\n channels (%d)\n channel mask (%d)\n bytes (%d)\n",im->xsize,im->ysize,im->channels,im->ch_mask,im->bytes);
+ fprintf(stderr, "mandlebrot: image info:\n size (%d,%d)\n channels (%d)\n",
+ im->xsize,im->ysize,im->channels);
div = 2.5;
xs = 0.8*div;

0 comments on commit 8a2cd31

Please sign in to comment.
Something went wrong with that request. Please try again.