45 lines
1.5 KiB
Text
45 lines
1.5 KiB
Text
- fix narrowing on archs where char is unsigned by default (ppc, arm)
|
|
- can't find abs of uint with clang
|
|
fix stolen from ufraw-current
|
|
- space between literal and identifier
|
|
|
|
Index: dcraw.cc
|
|
--- dcraw.cc.orig
|
|
+++ dcraw.cc
|
|
@@ -2285,7 +2285,7 @@ void CLASS quicktake_100_load_raw()
|
|
|
|
void CLASS kodak_radc_load_raw()
|
|
{
|
|
- static const char src[] = {
|
|
+ static const signed char src[] = {
|
|
1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8,
|
|
1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8,
|
|
2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8,
|
|
@@ -9240,13 +9240,13 @@ canon_a5:
|
|
filters = 0x16161616;
|
|
}
|
|
if (make[0] == 'O') {
|
|
- i = find_green (12, 32, 1188864, 3576832);
|
|
- c = find_green (12, 32, 2383920, 2387016);
|
|
- if (abs(i) < abs(c)) {
|
|
- SWAP(i,c);
|
|
+ float g1 = find_green (12, 32, 1188864, 3576832);
|
|
+ float g2 = find_green (12, 32, 2383920, 2387016);
|
|
+ if (fabsf(g1) < fabsf(g2)) {
|
|
+ SWAP(g1,g2);
|
|
load_flags = 24;
|
|
}
|
|
- if ((int) i < 0) filters = 0x61616161;
|
|
+ if (g1 < 0) filters = 0x61616161;
|
|
}
|
|
} else if (fsize == 5869568) {
|
|
if (!timestamp && minolta_z2()) {
|
|
@@ -10073,7 +10073,7 @@ void CLASS tiff_head (struct tiff_hdr *th, int full)
|
|
strncpy (th->desc, desc, 512);
|
|
strncpy (th->make, make, 64);
|
|
strncpy (th->model, model, 64);
|
|
- strcpy (th->soft, "dcraw v"DCRAW_VERSION);
|
|
+ strcpy (th->soft, "dcraw v" DCRAW_VERSION);
|
|
t = localtime (×tamp);
|
|
sprintf (th->date, "%04d:%02d:%02d %02d:%02d:%02d",
|
|
t->tm_year+1900,t->tm_mon+1,t->tm_mday,t->tm_hour,t->tm_min,t->tm_sec);
|