projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
terminate keyframe string in edl output
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
dcraw.C
diff --git
a/cinelerra-5.1/cinelerra/dcraw.C
b/cinelerra-5.1/cinelerra/dcraw.C
index 1913d982997569c181a857f109c9c5a055f56469..12e36160e3f0bccd55ae405ee0dfbfa35d225e6f 100644
(file)
--- a/
cinelerra-5.1/cinelerra/dcraw.C
+++ b/
cinelerra-5.1/cinelerra/dcraw.C
@@
-1002,7
+1002,7
@@
void CLASS canon_sraw_load_raw()
pix[2] = rp[0] + rp[1];
pix[1] = rp[0] + ((-778*rp[1] - (rp[2] << 11)) >> 12);
}
pix[2] = rp[0] + rp[1];
pix[1] = rp[0] + ((-778*rp[1] - (rp[2] << 11)) >> 12);
}
- FORC3 rp[c] = CLIP(pix[c] * sraw_mul[c] >> 10);
+ FORC3 rp[c] =
(int)
CLIP(pix[c] * sraw_mul[c] >> 10);
}
ljpeg_end (&jh);
maximum = 0x3fff;
}
ljpeg_end (&jh);
maximum = 0x3fff;
@@
-8696,7
+8696,7
@@
void CLASS identify()
parse_fuji (get4());
if (thumb_offset > 120) {
fseek (ifp, 120, SEEK_SET);
parse_fuji (get4());
if (thumb_offset > 120) {
fseek (ifp, 120, SEEK_SET);
- is_raw += (i = get4())
&& 1
;
+ is_raw += (i = get4())
? 1 : 0
;
if (is_raw == 2 && shot_select)
parse_fuji (i);
}
if (is_raw == 2 && shot_select)
parse_fuji (i);
}
@@
-10533,7
+10533,7
@@
thumbnail:
else if (output_tiff && write_fun == &CLASS write_ppm_tiff)
write_ext = ".tiff";
else
else if (output_tiff && write_fun == &CLASS write_ppm_tiff)
write_ext = ".tiff";
else
- write_ext =
".pgm\0.ppm\0.ppm\0.pam" + colors*5-5
;
+ write_ext =
&".pgm\0.ppm\0.ppm\0.pam"[colors*5-5]
;
ofname = (char *) malloc (strlen(ifname) + 64);
merror (ofname, "main()");
if (write_to_stdout)
ofname = (char *) malloc (strlen(ifname) + 64);
merror (ofname, "main()");
if (write_to_stdout)