19 19
*If you have not modified dcraw.c in any way, a link to my
20 20
homepage qualifies as "full source code".
21 21 22 -
$Revision: 1.450 $
23 -
$Date: 2012/06/30 20:36:46 $
22 +
$Revision: 1.451 $
23 +
$Date: 2012/07/05 04:33:11 $
24 24
*/
25 25 26 26
#define DCRAW_VERSION "9.16"
@@ -6897,6 +6897,8 @@ void CLASS adobe_coeff (const char *make, const char *model)
6897 6897
{ 8898,-2498,-994,-3144,11328,2066,-760,1381,4576 } },
6898 6898
{ "SAMSUNG NX2", 0, 0xfff, /* NX20, NX200, NX210 */
6899 6899
{ 6933,-2268,-753,-4921,13387,1647,-803,1641,6096 } },
6900 +
{ "SAMSUNG NX1000", 0, 0,
6901 +
{ 6933,-2268,-753,-4921,13387,1647,-803,1641,6096 } },
6900 6902
{ "SAMSUNG NX", 0, 0, /* NX5, NX10, NX11, NX100 */
6901 6903
{ 10332,-3234,-1168,-6111,14639,1520,-1352,2647,8331 } },
6902 6904
{ "SAMSUNG WB2000", 0, 0xfff,
@@ -6913,6 +6915,8 @@ void CLASS adobe_coeff (const char *make, const char *model)
6913 6915
{ 8512,-2641,-694,-8042,15670,2526,-1821,2117,7414 } },
6914 6916
{ "SONY DSC-V3", 0, 0,
6915 6917
{ 7511,-2571,-692,-7894,15088,3060,-948,1111,8128 } },
6918 +
{ "SONY DSC-RX100", 192, 0, /* DJC */
6919 +
{ 7329,-2746,-405,-2691,9338,3354,-136,1259,5051 } },
6916 6920
{ "SONY DSLR-A100", 0, 0xfeb,
6917 6921
{ 9437,-2811,-774,-8405,16215,2290,-710,596,7181 } },
6918 6922
{ "SONY DSLR-A290", 0, 0,
@@ -8040,11 +8044,11 @@ void CLASS identify()
8040 8044
raw_width = fsize/height/2;
8041 8045
order = 0x4d4d;
8042 8046
load_raw = &CLASS unpacked_load_raw;
8043 -
} else if (!strncmp(model,"NX1",3)) {
8047 +
} else if (!strcmp(make,"SAMSUNG") && raw_width == 4704) {
8044 8048
height -= top_margin = 8;
8045 8049
width -= 2 * (left_margin = 8);
8046 8050
load_flags = 32;
8047 -
} else if (!strncmp(model,"NX2",3)) {
8051 +
} else if (!strcmp(make,"SAMSUNG") && raw_width == 5632) {
8048 8052
order = 0x4949;
8049 8053
height = 3694;
8050 8054
top_margin = 2;
@@ -8312,6 +8316,8 @@ void CLASS identify()
8312 8316
adobe_coeff ("SONY","DSC-R1");
8313 8317
width = 3925;
8314 8318
order = 0x4d4d;
8319 +
} else if (!strcmp(make,"SONY") && raw_width == 5504) {
8320 +
width -= 8;
8315 8321
} else if (!strcmp(make,"SONY") && raw_width == 6048) {
8316 8322
width -= 24;
8317 8323
} else if (!strcmp(model,"DSLR-A100")) {
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4