Project

General

Profile

Bug #928 ยป T928.patch

Thomas Beutlich, 21 Oct 2013 14:38

View differences:

sonymn.cpp (working copy)
64 64

  
65 65
    //! Lookup table to translate Sony model ID values to readable labels
66 66
    extern const TagDetails sonyModelId[] = {
67
        { 2,   "DSC-R1"    },
68
        { 256, "DSLR-A100" },
69
        { 257, "DSLR-A900" },
70
        { 258, "DSLR-A700" },
71
        { 259, "DSLR-A200" },
72
        { 260, "DSLR-A350" },
73
        { 261, "DSLR-A300" },
74
        { 263, "DSLR-A380" },
75
        { 264, "DSLR-A330" },
76
        { 265, "DSLR-A230" },
77
        { 269, "DSLR-A850" },
78
        { 273, "DSLR-A550" },
79
        { 274, "DSLR-A500" },
80
        { 275, "DSLR-A450" },
81
        { 278, "NEX-5"     },
82
        { 279, "NEX-3"     }
67
        { 2, "DSC-R1"                   },
68
        { 256, "DSLR-A100"              },
69
        { 257, "DSLR-A900"              },
70
        { 258, "DSLR-A700"              },
71
        { 259, "DSLR-A200"              },
72
        { 260, "DSLR-A350"              },
73
        { 261, "DSLR-A300"              },
74
        { 262, "DSLR-A900 (APS-C mode)" },
75
        { 263, "DSLR-A380/A390"         },
76
        { 264, "DSLR-A330"              },
77
        { 265, "DSLR-A230"              },
78
        { 266, "DSLR-A290"              },
79
        { 269, "DSLR-A850"              },
80
        { 270, "DSLR-A850 (APS-C mode)" },
81
        { 273, "DSLR-A550"              },
82
        { 274, "DSLR-A500"              },
83
        { 275, "DSLR-A450"              },
84
        { 278, "NEX-5"                  },
85
        { 279, "NEX-3"                  },
86
        { 280, "SLT-A33"                },
87
        { 281, "SLT-A55 / SLT-A55V"     },
88
        { 282, "DSLR-A560"              },
89
        { 283, "DSLR-A580"              },
90
        { 284, "NEX-C3"                 },
91
        { 285, "SLT-A35"                },
92
        { 286, "SLT-A65 / SLT-A65V"     },
93
        { 287, "SLT-A77 / SLT-A77V"     },
94
        { 288, "NEX-5N"                 },
95
        { 289, "NEX-7"                  },
96
        { 290, "NEX-VG20E"              },
97
        { 291, "SLT-A37"                },
98
        { 292, "SLT-A57"                },
99
        { 293, "NEX-F3"                 },
100
        { 294, "SLT-A99 / SLT-A99V"     },
101
        { 295, "NEX-6"                  },
102
        { 296, "NEX-5R"                 },
103
        { 297, "DSC-RX100"              },
104
        { 298, "DSC-RX1"                },
105
        { 299, "NEX-VG900"              },
106
        { 300, "NEX-VG30E"              },
107
        { 302, "ILCE-3000"              },
108
        { 303, "SLT-A58"                },
109
        { 305, "NEX-3N"                 },
110
        { 306, "ILCE-7"                 },
111
        { 307, "NEX-5T"                 },
112
        { 308, "DSC-RX100M2"            },
113
        { 309, "DSC-RX10"               },
114
        { 310, "DSC-RX1R"               },
115
        { 311, "ILCE-7R"                }
83 116
    };
84 117

  
85 118
    //! Lookup table to translate Sony dynamic range optimizer values to readable labels
86 119
    extern const TagDetails print0xb025[] = {
87 120
        { 0,  N_("Off")           },
88
        { 1,  N_("Standard ")     },
121
        { 1,  N_("Standard")      },
89 122
        { 2,  N_("Advanced Auto") },
90 123
        { 3,  N_("Auto")          },
91 124
        { 8,  N_("Advanced Lv1")  },
......
105 138
        { 0,     N_("Auto")                     },
106 139
        { 1,     N_("Portrait")                 },
107 140
        { 2,     N_("Beach")                    },
141
        { 3,     N_("Sports")                   },
108 142
        { 4,     N_("Snow")                     },
109
        { 5,     N_("Landscape ")               },
143
        { 5,     N_("Landscape")                },
110 144
        { 6,     N_("Program")                  },
111 145
        { 7,     N_("Aperture priority")        },
112 146
        { 8,     N_("Shutter priority")         },
113 147
        { 9,     N_("Night Scene / Twilight")   },
114 148
        { 10,    N_("Hi-Speed Shutter")         },
115 149
        { 11,    N_("Twilight Portrait")        },
116
        { 12,    N_("Soft Snap")                },
150
        { 12,    N_("Soft Snap / Portrait")     },
117 151
        { 13,    N_("Fireworks")                },
118 152
        { 14,    N_("Smile Shutter")            },
119 153
        { 15,    N_("Manual")                   },
120 154
        { 18,    N_("High Sensitivity")         },
155
        { 19,    N_("Macro")                    },
121 156
        { 20,    N_("Advanced Sports Shooting") },
122 157
        { 29,    N_("Underwater")               },
123
        { 33,    N_("Gourmet")                  },
124
        { 34,    N_("Panorama")                 },
125
        { 35,    N_("Handheld Twilight")        },
158
        { 33,    N_("Food")                     },
159
        { 34,    N_("Sweep Panorama")           },
160
        { 35,    N_("Handheld Night Shot")      },
126 161
        { 36,    N_("Anti Motion Blur")         },
127 162
        { 37,    N_("Pet")                      },
128 163
        { 38,    N_("Backlight Correction HDR") },
164
        { 39,    N_("Superior Auto")            },
165
        { 40,    N_("Background Defocus")       },
166
        { 41,    N_("Soft Skin")                },
167
        { 42,    N_("3D Image")                 },
129 168
        { 65535, N_("n/a")                      }
130 169
    };
131 170

  
132 171
    //! Lookup table to translate Sony JPEG Quality values to readable labels
133 172
    extern const TagDetails sonyJPEGQuality[] = {
134
        { 0,     N_("Normal") },
135
        { 1,     N_("Fine")   },
136
        { 65535, N_("n/a")    }
173
        { 0,     N_("Normal")       },
174
        { 1,     N_("Fine")         },
175
        { 2,     N_("Extra Fine")   },
176
        { 65535, N_("n/a")          }
137 177
    };
138 178

  
139 179
    //! Lookup table to translate Sony anti-blur values to readable labels
......
167 207
        { 7,  N_("White Flourescent")          },
168 208
        { 8,  N_("Cool White Flourescent")     },
169 209
        { 9,  N_("Day White Flourescent")      },
210
        { 10, N_("Incandescent2")              },
211
        { 11, N_("Warm White Fluorescent")     }, 
170 212
        { 14, N_("Incandescent")               },
171 213
        { 15, N_("Flash")                      },
172 214
        { 17, N_("Underwater 1 (Blue Water)")  },
    (1-1/1)