Project

General

Profile

Patch #879 ยป exiv2_olympus.patch

Niels Kristian Bech Jensen, 15 Jan 2013 07:23

View differences:

src/olympusmn.cpp (working copy)
1237 1237
            byte val[3];
1238 1238
            const char *label;
1239 1239
        } lensTypes[] = {
1240
            { { 0,  0,  0 }, N_("None")                                            },
1241
            { { 0,  1,  0 }, N_("Olympus Zuiko Digital ED 50mm F2.0 Macro")        },
1242
            { { 0,  1,  1 }, N_("Olympus Zuiko Digital 40-150mm F3.5-4.5")         },
1243
            { { 0,  1, 16 }, N_("Olympus M.Zuiko Digital ED 14-42mm F3.5-5.6")     },
1244
            { { 0,  2,  0 }, N_("Olympus Zuiko Digital ED 150mm F2.0")             },
1245
            { { 0,  2, 16 }, N_("Olympus M.Zuiko Digital 17mm F2.8 Pancake")       },
1246
            { { 0,  3,  0 }, N_("Olympus Zuiko Digital ED 300mm F2.8")             },
1247
            { { 0,  3, 16 }, N_("Olympus M.Zuiko Digital ED 14-150mm F4.0-5.6")    },
1248
            { { 0,  4, 16 }, N_("Olympus M.Zuiko Digital ED 9-18mm F4.0-5.6")      },
1249
            { { 0,  5,  0 }, N_("Olympus Zuiko Digital 14-54mm F2.8-3.5")          },
1250
            { { 0,  5,  1 }, N_("Olympus Zuiko Digital Pro ED 90-250mm F2.8")      },
1251
            { { 0,  5, 16 }, N_("Olympus M.Zuiko Digital ED 14-42mm F3.5-5.6 L")   },
1252
            { { 0,  6,  0 }, N_("Olympus Zuiko Digital ED 50-200mm F2.8-3.5")      },
1253
            { { 0,  6,  1 }, N_("Olympus Zuiko Digital ED 8mm F3.5 Fisheye")       },
1254
            { { 0,  6, 16 }, N_("Olympus M.Zuiko Digital ED 40-150mm F4.0-5.6")    },
1255
            { { 0,  7,  0 }, N_("Olympus Zuiko Digital 11-22mm F2.8-3.5")          },
1256
            { { 0,  7,  1 }, N_("Olympus Zuiko Digital 18-180mm F3.5-6.3")         },
1257
            { { 0,  7, 16 }, N_("Olympus M.Zuiko Digital ED 12mm F2.0")            },
1258
            { { 0,  8,  1 }, N_("Olympus Zuiko Digital 70-300mm F4.0-5.6")         },
1259
            { { 0,  8, 16 }, N_("Olympus M.Zuiko Digital ED 75-300mm F4.8-6.7")    },
1260
            { { 0,  9, 16 }, N_("Olympus M.Zuiko Digital 14-42mm F3.5-5.6 II")     },
1261
            { { 0, 16, 16 }, N_("Olympus M.Zuiko Digital ED 12-50mm F3.5-6.3 EZ")  },
1262
            { { 0, 17, 16 }, N_("Olympus M.Zuiko Digital 45mm F1.8")               },
1263
            { { 0, 18, 16 }, N_("Olympus M.Zuiko Digital ED 60mm F2.8 Macro")      },
1264
            { { 0, 19, 16 }, N_("Olympus M.Zuiko Digital ED 14-42mm F3.5-5.6 II R") },
1240
            { { 0,  0,  0 }, N_("None")                                                 },
1241
            { { 0,  1,  0 }, N_("Olympus Zuiko Digital ED 50mm F2.0 Macro")             },
1242
            { { 0,  1,  1 }, N_("Olympus Zuiko Digital 40-150mm F3.5-4.5")              },
1243
            { { 0,  1, 16 }, N_("Olympus M.Zuiko Digital ED 14-42mm F3.5-5.6")          },
1244
            { { 0,  2,  0 }, N_("Olympus Zuiko Digital ED 150mm F2.0")                  },
1245
            { { 0,  2, 16 }, N_("Olympus M.Zuiko Digital 17mm F2.8 Pancake")            },
1246
            { { 0,  3,  0 }, N_("Olympus Zuiko Digital ED 300mm F2.8")                  },
1247
            { { 0,  3, 16 }, N_("Olympus M.Zuiko Digital ED 14-150mm F4.0-5.6")         },
1248
            { { 0,  4, 16 }, N_("Olympus M.Zuiko Digital ED 9-18mm F4.0-5.6")           },
1249
            { { 0,  5,  0 }, N_("Olympus Zuiko Digital 14-54mm F2.8-3.5")               },
1250
            { { 0,  5,  1 }, N_("Olympus Zuiko Digital Pro ED 90-250mm F2.8")           },
1251
            { { 0,  5, 16 }, N_("Olympus M.Zuiko Digital ED 14-42mm F3.5-5.6 L")        },
1252
            { { 0,  6,  0 }, N_("Olympus Zuiko Digital ED 50-200mm F2.8-3.5")           },
1253
            { { 0,  6,  1 }, N_("Olympus Zuiko Digital ED 8mm F3.5 Fisheye")            },
1254
            { { 0,  6, 16 }, N_("Olympus M.Zuiko Digital ED 40-150mm F4.0-5.6")         },
1255
            { { 0,  7,  0 }, N_("Olympus Zuiko Digital 11-22mm F2.8-3.5")               },
1256
            { { 0,  7,  1 }, N_("Olympus Zuiko Digital 18-180mm F3.5-6.3")              },
1257
            { { 0,  7, 16 }, N_("Olympus M.Zuiko Digital ED 12mm F2.0")                 },
1258
            { { 0,  8,  1 }, N_("Olympus Zuiko Digital 70-300mm F4.0-5.6")              },
1259
            { { 0,  8, 16 }, N_("Olympus M.Zuiko Digital ED 75-300mm F4.8-6.7")         },
1260
            { { 0,  9, 16 }, N_("Olympus M.Zuiko Digital 14-42mm F3.5-5.6 II")          },
1261
            { { 0, 16, 16 }, N_("Olympus M.Zuiko Digital ED 12-50mm F3.5-6.3 EZ")       },
1262
            { { 0, 17, 16 }, N_("Olympus M.Zuiko Digital 45mm F1.8")                    },
1263
            { { 0, 18, 16 }, N_("Olympus M.Zuiko Digital ED 60mm F2.8 Macro")           },
1264
            { { 0, 19, 16 }, N_("Olympus M.Zuiko Digital ED 14-42mm F3.5-5.6 II R")     },
1265 1265
            { { 0, 20, 16 }, N_("Olympus M.Zuiko Digital ED 14-150mm II or 40-150mm R") },
1266
            { { 0, 21,  0 }, N_("Olympus Zuiko Digital ED 7-14mm F4.0")            },
1267
            { { 0, 21, 16 }, N_("Olympus M.Zuiko Digital ED 75mm F1.8")            },
1268
            { { 0, 22, 16 }, N_("Olympus M.Zuiko Digital 17mm F1.8")               },
1269
            { { 0, 23,  0 }, N_("Olympus Zuiko Digital Pro ED 35-100mm F2.0")      },
1270
            { { 0, 24,  0 }, N_("Olympus Zuiko Digital 14-45mm F3.5-5.6")          },
1271
            { { 0, 32,  0 }, N_("Olympus Zuiko Digital 35mm F3.5 Macro")           },
1272
            { { 0, 34,  0 }, N_("Olympus Zuiko Digital 17.5-45mm F3.5-5.6")        },
1273
            { { 0, 35,  0 }, N_("Olympus Zuiko Digital ED 14-42mm F3.5-5.6")       },
1274
            { { 0, 36,  0 }, N_("Olympus Zuiko Digital ED 40-150mm F4.0-5.6")      },
1275
            { { 0, 48,  0 }, N_("Olympus Zuiko Digital ED 50-200mm F2.8-3.5 SWD")  },
1276
            { { 0, 49,  0 }, N_("Olympus Zuiko Digital ED 12-60mm F2.8-4.0 SWD")   },
1277
            { { 0, 50,  0 }, N_("Olympus Zuiko Digital ED 14-35mm F2.0 SWD")       },
1278
            { { 0, 51,  0 }, N_("Olympus Zuiko Digital 25mm F2.8")                 },
1279
            { { 0, 52,  0 }, N_("Olympus Zuiko Digital ED 9-18mm F4.0-5.6")        },
1280
            { { 0, 53,  0 }, N_("Olympus Zuiko Digital 14-54mm F2.8-3.5 II")       },
1281
            { { 1,  1,  0 }, N_("Sigma 18-50mm F3.5-5.6")                          },
1282
            { { 1,  1, 16 }, N_("Sigma 30mm F2.8 EX DN")                           },
1283
            { { 1,  2,  0 }, N_("Sigma 55-200mm F4.0-5.6 DC")                      },
1284
            { { 1,  2, 16 }, N_("Sigma 19mm F2.8 EX DN")                           },
1285
            { { 1,  3,  0 }, N_("Sigma 18-125mm F3.5-5.6 DC")                      },
1286
            { { 1,  4,  0 }, N_("Sigma 18-125mm F3.5-5.6")                         },
1287
            { { 1,  5,  0 }, N_("Sigma 30mm F1.4")                                 },
1288
            { { 1,  6,  0 }, N_("Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF")        },
1289
            { { 1,  7,  0 }, N_("Sigma 105mm F2.8 DG")                             },
1290
            { { 1,  8,  0 }, N_("Sigma 150mm F2.8 DG HSM")                         },
1291
            { { 1, 16,  0 }, N_("Sigma 24mm F1.8 EX DG Aspherical Macro")          },
1292
            { { 1, 17,  0 }, N_("Sigma 135-400mm F4.5-5.6 DG ASP APO RF")          },
1293
            { { 1, 18,  0 }, N_("Sigma 300-800mm F5.6 EX DG APO")                  },
1294
            { { 1, 19,  0 }, N_("Sigma 30mm F1.4 EX DC HSM")                       },
1295
            { { 1, 20,  0 }, N_("Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF")        },
1296
            { { 1, 21,  0 }, N_("Sigma 10-20mm F4.0-5.6 EX DC HSM")                },
1297
            { { 1, 22,  0 }, N_("Sigma 70-200mm F2.8 EX DG Macro HSM II")          },
1298
            { { 1, 23,  0 }, N_("Sigma 50mm F1.4 EX DG HSM")                       },
1299
            { { 2,  1,  0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph.")    },
1300
            { { 2,  1, 16 }, N_("Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega OIS")   },
1301
            { { 2,  2,  0 }, N_("Leica D Summilux 25mm F1.4 Asph.")                },
1302
            { { 2,  2, 16 }, N_("Lumix G Vario 45-200mm F4-5.6 Mega OIS")          },
1303
            { { 2,  3,  0 }, N_("Leica D Vario Elmar 14-50mm F3.8-5.6 Asph. Mega OIS") },
1304
            { { 2,  3,  1 }, N_("Leica D Vario Elmar 14-50mm F3.8-5.6 Asph.")      },
1305
            { { 2,  3, 16 }, N_("Lumix G Vario HD 14-140mm F4-5.8 Asph. Mega OIS") },
1306
            { { 2,  4,  0 }, N_("Leica D Vario Elmar 14-150mm F3.5-5.6")           },
1307
            { { 2,  4, 16 }, N_("Lumix G Vario 7-14mm F4 Asph.")                   },
1308
            { { 2,  5, 16 }, N_("Lumix G 20mm F1.7 Asph.")                         },
1309
            { { 2,  6, 16 }, N_("Leica DG Macro-Elmarit 45mm F2.8")                },
1310
            { { 2,  8, 16 }, N_("Lumix G Fisheye 8mm F3.5")                        },
1311
            { { 2,  9, 16 }, N_("Lumix G Vario 100-300mm F4.0-5.6 OIS")            },
1312
            { { 2, 16, 16 }, N_("Lumix G 14mm F2.5 Asph.")                         },
1313
            { { 2, 20, 16 }, N_("Lumix G X Vario PZ 14-42mm F3.5-5.6 ASPH Power OIS") },
1314
            { { 2, 21, 16 }, N_("Lumix G X Vario 12-35mm F2.8 ASPH Power OIS")     },
1315
            { { 3,  1,  0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph.")    },
1316
            { { 3,  2,  0 }, N_("Leica D Summilux 25mm F1.4 Asph.")                },
1266
            { { 0, 21,  0 }, N_("Olympus Zuiko Digital ED 7-14mm F4.0")                 },
1267
            { { 0, 21, 16 }, N_("Olympus M.Zuiko Digital ED 75mm F1.8")                 },
1268
            { { 0, 22, 16 }, N_("Olympus M.Zuiko Digital 17mm F1.8")                    },
1269
            { { 0, 23,  0 }, N_("Olympus Zuiko Digital Pro ED 35-100mm F2.0")           },
1270
            { { 0, 24,  0 }, N_("Olympus Zuiko Digital 14-45mm F3.5-5.6")               },
1271
            { { 0, 32,  0 }, N_("Olympus Zuiko Digital 35mm F3.5 Macro")                },
1272
            { { 0, 34,  0 }, N_("Olympus Zuiko Digital 17.5-45mm F3.5-5.6")             },
1273
            { { 0, 35,  0 }, N_("Olympus Zuiko Digital ED 14-42mm F3.5-5.6")            },
1274
            { { 0, 36,  0 }, N_("Olympus Zuiko Digital ED 40-150mm F4.0-5.6")           },
1275
            { { 0, 48,  0 }, N_("Olympus Zuiko Digital ED 50-200mm F2.8-3.5 SWD")       },
1276
            { { 0, 49,  0 }, N_("Olympus Zuiko Digital ED 12-60mm F2.8-4.0 SWD")        },
1277
            { { 0, 50,  0 }, N_("Olympus Zuiko Digital ED 14-35mm F2.0 SWD")            },
1278
            { { 0, 51,  0 }, N_("Olympus Zuiko Digital 25mm F2.8")                      },
1279
            { { 0, 52,  0 }, N_("Olympus Zuiko Digital ED 9-18mm F4.0-5.6")             },
1280
            { { 0, 53,  0 }, N_("Olympus Zuiko Digital 14-54mm F2.8-3.5 II")            },
1281
            { { 1,  1,  0 }, N_("Sigma 18-50mm F3.5-5.6")                               },
1282
            { { 1,  1, 16 }, N_("Sigma 30mm F2.8 EX DN")                                },
1283
            { { 1,  2,  0 }, N_("Sigma 55-200mm F4.0-5.6 DC")                           },
1284
            { { 1,  2, 16 }, N_("Sigma 19mm F2.8 EX DN")                                },
1285
            { { 1,  3,  0 }, N_("Sigma 18-125mm F3.5-5.6 DC")                           },
1286
            { { 1,  4,  0 }, N_("Sigma 18-125mm F3.5-5.6")                              },
1287
            { { 1,  5,  0 }, N_("Sigma 30mm F1.4")                                      },
1288
            { { 1,  6,  0 }, N_("Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF")             },
1289
            { { 1,  7,  0 }, N_("Sigma 105mm F2.8 DG")                                  },
1290
            { { 1,  8,  0 }, N_("Sigma 150mm F2.8 DG HSM")                              },
1291
            { { 1, 16,  0 }, N_("Sigma 24mm F1.8 EX DG Aspherical Macro")               },
1292
            { { 1, 17,  0 }, N_("Sigma 135-400mm F4.5-5.6 DG ASP APO RF")               },
1293
            { { 1, 18,  0 }, N_("Sigma 300-800mm F5.6 EX DG APO")                       },
1294
            { { 1, 19,  0 }, N_("Sigma 30mm F1.4 EX DC HSM")                            },
1295
            { { 1, 20,  0 }, N_("Sigma 50-500mm F4.0-6.3 EX DG APO HSM RF")             },
1296
            { { 1, 21,  0 }, N_("Sigma 10-20mm F4.0-5.6 EX DC HSM")                     },
1297
            { { 1, 22,  0 }, N_("Sigma 70-200mm F2.8 EX DG Macro HSM II")               },
1298
            { { 1, 23,  0 }, N_("Sigma 50mm F1.4 EX DG HSM")                            },
1299
            { { 2,  1,  0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph.")         },
1300
            { { 2,  1, 16 }, N_("Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega OIS")        },
1301
            { { 2,  2,  0 }, N_("Leica D Summilux 25mm F1.4 Asph.")                     },
1302
            { { 2,  2, 16 }, N_("Lumix G Vario 45-200mm F4-5.6 Mega OIS")               },
1303
            { { 2,  3,  0 }, N_("Leica D Vario Elmar 14-50mm F3.8-5.6 Asph. Mega OIS")  },
1304
            { { 2,  3,  1 }, N_("Leica D Vario Elmar 14-50mm F3.8-5.6 Asph.")           },
1305
            { { 2,  3, 16 }, N_("Lumix G Vario HD 14-140mm F4-5.8 Asph. Mega OIS")      },
1306
            { { 2,  4,  0 }, N_("Leica D Vario Elmar 14-150mm F3.5-5.6")                },
1307
            { { 2,  4, 16 }, N_("Lumix G Vario 7-14mm F4 Asph.")                        },
1308
            { { 2,  5, 16 }, N_("Lumix G 20mm F1.7 Asph.")                              },
1309
            { { 2,  6, 16 }, N_("Leica DG Macro-Elmarit 45mm F2.8")                     },
1310
            { { 2,  8, 16 }, N_("Lumix G Fisheye 8mm F3.5")                             },
1311
            { { 2,  9, 16 }, N_("Lumix G Vario 100-300mm F4.0-5.6 OIS")                 },
1312
            { { 2, 16, 16 }, N_("Lumix G 14mm F2.5 Asph.")                              },
1313
            { { 2, 18, 16 }, N_("Leica DG Summilux 25mm F1.4 Asph.")                    },
1314
            { { 2, 20, 16 }, N_("Lumix G X Vario PZ 14-42mm F3.5-5.6 ASPH Power OIS")   },
1315
            { { 2, 21, 16 }, N_("Lumix G X Vario 12-35mm F2.8 ASPH Power OIS")          },
1316
            { { 3,  1,  0 }, N_("Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph.")         },
1317
            { { 3,  2,  0 }, N_("Leica D Summilux 25mm F1.4 Asph.")                     },
1317 1318
            // End of list marker
1318 1319
            { { 0xff,  0,  0 }, "" }
1319 1320
        };
    (1-1/1)