Spelling (#2067)
* spelling: accelerometer Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: address Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: anonymous Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: available Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: baby Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: buffer Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: build Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: builds Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: by inclusion Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: byte order Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: camera Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: command Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: consistency Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: constructor Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: continuous Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: continuously Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: correspond Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: decompression Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: dedicated Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: denominator Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: dependencies Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: detector Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: dlighting Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: dragging Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: duplicate Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: dynamic Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: empty Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: enable Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: endianness Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: examining Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: exceed Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: extension Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: fact Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: fails Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: fixed Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: fluorescent Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: focuspoint Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: focuspoints Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: from Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: happened Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: hierarchy Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: initiate Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: interesting Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: internal Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: javascript Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: language Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: libiconv Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: libraries Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: library Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: localization Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: macros Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: member Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: members Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: metadata Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: miscellaneous Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: mnemonic Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: modified Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: multiple Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: multithreaded Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: mysterious Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: photoshop Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: platforms Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: preliminary Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: priority Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: properties Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: qualifier Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: recognition Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: recognized Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: reentrancy Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: remaining Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: remotetest Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: requested Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: sensitivity Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: standardize Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: successful Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: such Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: tags Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: temperature Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: test Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: the Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: these Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: third Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: this Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: transparent Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: unable Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: underwater Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: uninterpreted Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: using Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: utc - coordinated universal time Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: which Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> * spelling: with Signed-off-by: Josh Soref <jsoref@users.noreply.github.com> Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
This commit is contained in:
+1
-1
@@ -186,7 +186,7 @@ elseif(EXIV2_ENABLE_EXTERNAL_XMP)
|
||||
target_compile_definitions(exiv2lib PUBLIC EXV_ADOBE_XMPSDK=2016)
|
||||
endif()
|
||||
|
||||
# Use include/exiv2 to build libary code
|
||||
# Use include/exiv2 to build library code
|
||||
target_include_directories(exiv2lib PUBLIC
|
||||
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/exiv2>
|
||||
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
|
||||
|
||||
+1
-1
@@ -212,7 +212,7 @@ namespace Action {
|
||||
}; // class Print
|
||||
|
||||
/*!
|
||||
@brief %Rename a file to its metadate creation timestamp,
|
||||
@brief %Rename a file to its metadata creation timestamp,
|
||||
in the specified format.
|
||||
*/
|
||||
class Rename : public Task {
|
||||
|
||||
+4
-4
@@ -2080,7 +2080,7 @@ namespace Exiv2 {
|
||||
throw Error(kerErrorMessage, "Please set the path of the server script to handle http post data to EXIV2_HTTP_POST environmental variable.");
|
||||
}
|
||||
|
||||
// standadize the path without "/" at the beginning.
|
||||
// standardize the path without "/" at the beginning.
|
||||
std::size_t protocolIndex = scriptPath.find("://");
|
||||
if (protocolIndex == std::string::npos && scriptPath[0] != '/') {
|
||||
scriptPath = "/" + scriptPath;
|
||||
@@ -2192,7 +2192,7 @@ namespace Exiv2 {
|
||||
CurlIo::CurlImpl::CurlImpl(const std::string& url, size_t blockSize) : Impl(url, blockSize), curl_(curl_easy_init())
|
||||
{
|
||||
if(!curl_) {
|
||||
throw Error(kerErrorMessage, "Uable to init libcurl.");
|
||||
throw Error(kerErrorMessage, "Unable to init libcurl.");
|
||||
}
|
||||
|
||||
// The default block size for FTP is much larger than other protocols
|
||||
@@ -2218,7 +2218,7 @@ namespace Exiv2 {
|
||||
// init curl pointer
|
||||
curl_ = curl_easy_init();
|
||||
if(!curl_) {
|
||||
throw Error(kerErrorMessage, "Uable to init libcurl.");
|
||||
throw Error(kerErrorMessage, "Unable to init libcurl.");
|
||||
}
|
||||
|
||||
// The default block size for FTP is much larger than other protocols
|
||||
@@ -2245,7 +2245,7 @@ namespace Exiv2 {
|
||||
|
||||
/* Perform the request, res will get the return code */
|
||||
CURLcode res = curl_easy_perform(curl_);
|
||||
if(res != CURLE_OK) { // error happends
|
||||
if(res != CURLE_OK) { // error happened
|
||||
throw Error(kerErrorMessage, curl_easy_strerror(res));
|
||||
}
|
||||
// get status
|
||||
|
||||
+2
-2
@@ -67,7 +67,7 @@
|
||||
#define TAG_iinf 0x69696e66 /**< "iinf" Item info */
|
||||
#define TAG_iloc 0x696c6f63 /**< "iloc" Item location */
|
||||
#define TAG_ispe 0x69737065 /**< "ispe" Image spatial extents */
|
||||
#define TAG_infe 0x696e6665 /**< "infe" Item Info Extention */
|
||||
#define TAG_infe 0x696e6665 /**< "infe" Item Info Extension */
|
||||
#define TAG_ipma 0x69706d61 /**< "ipma" Item Property Association */
|
||||
#define TAG_cmt1 0x434d5431 /**< "CMT1" ifd0Id */
|
||||
#define TAG_cmt2 0x434D5432 /**< "CMD2" exifID */
|
||||
@@ -245,7 +245,7 @@ namespace Exiv2
|
||||
out << std::endl;
|
||||
}
|
||||
// The enforce() above checks that restore + buffer_size won't
|
||||
// exceed pbox_end, and by implication, won't excced LONG_MAX
|
||||
// exceed pbox_end, and by implication, won't exceed LONG_MAX
|
||||
return restore + buffer_size;
|
||||
}
|
||||
|
||||
|
||||
+6
-6
@@ -740,8 +740,8 @@ namespace Exiv2 {
|
||||
{0x000a, "WB_GRGBLevelsDaylight", N_("WB_G RGB Levels Daylight"), N_("WB_G RGB Levels Daylight"), canonWbId, makerTags, unsignedLong, -1, printValue},
|
||||
{0x0012, "WB_GRGBLevelsCloudy", N_("WB_G RGB Levels Cloudy"), N_("WB_G RGB Levels Cloudy"), canonWbId, makerTags, unsignedLong, -1, printValue},
|
||||
{0x001a, "WB_GRGBLevelsTungsten", N_("WB_G RGB Levels Tungsten"), N_("WB_G RGB Levels Tungsten"), canonWbId, makerTags, unsignedLong, -1, printValue},
|
||||
{0x0022, "WB_GRGBLevelsFluorescent", N_("WB_G RGB Levels Flourescent"), N_("WB_G RGB Levels Flourescent"), canonWbId, makerTags, unsignedLong, -1, printValue},
|
||||
{0x002a, "WB_GRGBLevelsFluorHigh", N_("WB_G RGB Levels Flourecent High"), N_("WB_G RGB Levels Flourecent High"), canonWbId, makerTags, unsignedLong, -1, printValue},
|
||||
{0x0022, "WB_GRGBLevelsFluorescent", N_("WB_G RGB Levels Fluorescent"), N_("WB_G RGB Levels Fluorescent"), canonWbId, makerTags, unsignedLong, -1, printValue},
|
||||
{0x002a, "WB_GRGBLevelsFluorHigh", N_("WB_G RGB Levels Fluorescent High"), N_("WB_G RGB Levels Fluorescent High"), canonWbId, makerTags, unsignedLong, -1, printValue},
|
||||
{0x0032, "WB_GRGBLevelsFlash", N_("WB_G RGB Levels Flash"), N_("WB_G RGB Levels Flash"), canonWbId, makerTags, unsignedLong, -1, printValue},
|
||||
{0x003a, "WB_GRGBLevelsUnderwater", N_("WB_G RGB Levels Underwater"), N_("WB_G RGB Levels Underwater"), canonWbId, makerTags, unsignedLong, -1, printValue},
|
||||
{0x0042, "WB_GRGBLevelsCustom1", N_("WB_G RGB Levels Custom 1"), N_("WB_G RGB Levels Custom 1"), canonWbId, makerTags, unsignedLong, -1, printValue},
|
||||
@@ -849,7 +849,7 @@ namespace Exiv2 {
|
||||
{0x000d, "WB_RGGBLevelsShade", N_("WB_RGGB Levels Shade"), N_("WB_RGGB Levels Shade"), canonCbId, makerTags, signedShort, -1, printValue},
|
||||
{0x001a, "WB_RGGBLevelsCloudy", N_("WB_RGGB Levels Cloudy"), N_("WB_RGGB Levels Cloudy"), canonCbId, makerTags, signedShort, -1, printValue},
|
||||
{0x0011, "WB_RGGBLevelsTungsten", N_("WB_RGGB Levels Tungsten"), N_("WB_RGGB Levels Tungsten"), canonCbId, makerTags, signedShort, -1, printValue},
|
||||
{0x0015, "WB_RGGBLevelsFlourescent", N_("WB_RGGB Levels Flourecent"), N_("WB_RGGB Levels Flourecent"), canonCbId, makerTags, signedShort, -1, printValue},
|
||||
{0x0015, "WB_RGGBLevelsFluorescent", N_("WB_RGGB Levels Fluorescent"), N_("WB_RGGB Levels Fluorescent"), canonCbId, makerTags, signedShort, -1, printValue},
|
||||
{0x0032, "WB_RGGBLevelsFlash", N_("WB_RGGB Levels Flash"), N_("WB_RGGB Levels Flash"), canonCbId, makerTags, signedShort, -1, printValue},
|
||||
{0x001d, "WB_RGGBLevelsCustomBlackLevels", N_("WB_RGGB Levels Custom Black Levels"), N_("WB_RGGB Levels Custom Black Levels"), canonCbId, makerTags, signedShort, -1, printValue},
|
||||
{0x0021, "WB_RGGBLevelsKelvin", N_("WB_RGGB Levels Kelvin"), N_("WB_RGGB Levels Kelvin"), canonCbId, makerTags, signedShort, -1, printValue},
|
||||
@@ -1189,7 +1189,7 @@ namespace Exiv2 {
|
||||
// Canon OneShotAFRelease, tag 0x0001
|
||||
constexpr TagDetails canonOneShotAFRelease[] = {
|
||||
{ 0, N_("Focus Priority") },
|
||||
{ 1, N_("Release Priortiy") }
|
||||
{ 1, N_("Release Priority") }
|
||||
};
|
||||
|
||||
// Canon AutoAFPointSelEOSiTRAF, tag 0x0001
|
||||
@@ -1230,7 +1230,7 @@ namespace Exiv2 {
|
||||
// Canon ManualAFPointSelPattern, tag 0x0001
|
||||
constexpr TagDetails canonManualAFPointSelPattern[] = {
|
||||
{ 0, N_("Stops at AF Area Edges") },
|
||||
{ 1, N_("Continous") }
|
||||
{ 1, N_("Continuous") }
|
||||
};
|
||||
|
||||
// Canon AFPointDisplayDuringFocus, tag 0x0001
|
||||
@@ -2914,7 +2914,7 @@ namespace Exiv2 {
|
||||
if ( value.typeId() == unsignedShort
|
||||
&& value.count() > 0) {
|
||||
// The offset of '5' seems to be ok for most Canons (see Exiftool)
|
||||
// It might be explained by the fakt, that most Canons have a longest
|
||||
// It might be explained by the fact, that most Canons have a longest
|
||||
// exposure of 30s which is 5 EV below 1s
|
||||
// see also printSi0x0017
|
||||
std::ostringstream oss;
|
||||
|
||||
+6
-6
@@ -367,11 +367,11 @@ namespace Exiv2 {
|
||||
|
||||
//! AutoISO, tag 0x3008
|
||||
constexpr TagDetails casio2AutoISO[] = {
|
||||
{ 1, N_("On") },
|
||||
{ 2, N_("Off") },
|
||||
{ 7, N_("On (high sensitiviy)") },
|
||||
{ 8, N_("On (anti-shake)") },
|
||||
{ 10, N_("High Speed") }
|
||||
{ 1, N_("On") },
|
||||
{ 2, N_("Off") },
|
||||
{ 7, N_("On (high sensitivity)") },
|
||||
{ 8, N_("On (anti-shake)") },
|
||||
{ 10, N_("High Speed") }
|
||||
};
|
||||
|
||||
//! AFMode, tag 0x3009
|
||||
@@ -396,7 +396,7 @@ namespace Exiv2 {
|
||||
{ 0, N_("Off") },
|
||||
{ 1, N_("Scenery") },
|
||||
{ 3, N_("Green") },
|
||||
{ 5, N_("Unterwater") },
|
||||
{ 5, N_("Underwater") },
|
||||
{ 9, N_("Flesh Tones") }
|
||||
|
||||
};
|
||||
|
||||
@@ -226,7 +226,7 @@ namespace Exiv2 {
|
||||
//! Return the tag id of this component
|
||||
uint16_t tagId() const { return tag_ & 0x3fff; }
|
||||
|
||||
//! Return the type id of thi component
|
||||
//! Return the type id of this component
|
||||
TypeId typeId() const { return typeId(tag_); }
|
||||
|
||||
//! Return the data location for this component
|
||||
|
||||
+1
-1
@@ -155,7 +155,7 @@ namespace Exiv2 {
|
||||
md_st->write(os, &ed);
|
||||
bool ok = false;
|
||||
const long st_val = parseLong(os.str(), ok);
|
||||
// SensivityType out of range or cannot be parsed properly
|
||||
// SensitivityType out of range or cannot be parsed properly
|
||||
if (!ok || st_val < 1 || st_val > 7)
|
||||
break;
|
||||
// pick up list of ISO tags, and check for at least one of
|
||||
|
||||
+1
-1
@@ -314,7 +314,7 @@ private:
|
||||
|
||||
public:
|
||||
/*!
|
||||
@brief Call Getopt::getopt() with optstring, to inititate command line
|
||||
@brief Call Getopt::getopt() with optstring, to initiate command line
|
||||
argument parsing, perform consistency checks after all command line
|
||||
arguments are parsed.
|
||||
|
||||
|
||||
@@ -181,7 +181,7 @@ struct IMAGEINFO_T
|
||||
unsigned long trigCount; //!< trig counter
|
||||
short manipulType; //!< defines how to interpret manipFactors
|
||||
short manipFactors[5]; //!< Used average factors
|
||||
/** Detecor settings - camera type dependent */
|
||||
/** Detector settings - camera type dependent */
|
||||
long detectorPars[20]; //!< Currently used detector parameters like
|
||||
//! used bias, offsets. Usage is camera
|
||||
//! dependent
|
||||
@@ -205,7 +205,7 @@ struct DISTR_DATA_T
|
||||
//! FALSE
|
||||
long curGlobalOffset;
|
||||
float curGlobalGain; //!< globalOffset/Gain to generate LUT from
|
||||
//! updated continously when live only
|
||||
//! updated continuously when live only
|
||||
#define regulationOn 1
|
||||
unsigned short regulMethodMask; //!< Method used for o/g calculation
|
||||
unsigned short visualImage; //!< TRUE (1) for TV (visual)
|
||||
|
||||
+1
-1
@@ -366,7 +366,7 @@ int Exiv2::http(Exiv2::Dictionary& request,Exiv2::Dictionary& response,std::stri
|
||||
}
|
||||
}
|
||||
|
||||
// if the bufffer's full and we're still searching - give up!
|
||||
// if the buffer's full and we're still searching - give up!
|
||||
// this handles the possibility that there are no headers
|
||||
if ( bSearching && buff_l-end < 10 ) {
|
||||
bSearching = false ;
|
||||
|
||||
+1
-1
@@ -554,7 +554,7 @@ namespace Exiv2 {
|
||||
std::vector<long> iptcDataSegs;
|
||||
|
||||
if (bPrint || option == kpsXMP || option == kpsIccProfile || option == kpsIptcErase) {
|
||||
// nmonic for markers
|
||||
// mnemonic for markers
|
||||
std::string nm[256];
|
||||
nm[0xd8] = "SOI";
|
||||
nm[0xd9] = "EOI";
|
||||
|
||||
@@ -790,7 +790,7 @@ namespace Exiv2 {
|
||||
{0x0048, "ExposureTime", N_("Exposure Time"),
|
||||
N_("Exposure time"),
|
||||
minoltaCs7DId, makerTags, unsignedShort, 1, printValue},
|
||||
// 0x004A is a dupplicate than 0x002D.
|
||||
// 0x004A is a duplicate than 0x002D.
|
||||
{0x004A, "FreeMemoryCardImages", N_("Free Memory Card Images"),
|
||||
N_("Free memory card images"),
|
||||
minoltaCs7DId, makerTags, unsignedShort, 1, printValue},
|
||||
@@ -800,7 +800,7 @@ namespace Exiv2 {
|
||||
{0x0060, "NoiseReduction", N_("Noise Reduction"),
|
||||
N_("Noise reduction"),
|
||||
minoltaCs7DId, makerTags, unsignedShort, 1, printMinoltaSonyBoolValue},
|
||||
// 0x0062 is a dupplicate than 0x005E.
|
||||
// 0x0062 is a duplicate than 0x005E.
|
||||
{0x0062, "ImageNumber", N_("Image Number"),
|
||||
N_("Image number"),
|
||||
minoltaCs7DId, makerTags, unsignedShort, 1, printValue},
|
||||
|
||||
+6
-6
@@ -61,7 +61,7 @@ namespace Exiv2 {
|
||||
};
|
||||
|
||||
//! Off, Low, Normal, High, multiple tags
|
||||
constexpr TagDetails nikonActiveDLighning[] = {
|
||||
constexpr TagDetails nikonActiveDLighting[] = {
|
||||
{ 0, N_("Off") },
|
||||
{ 1, N_("Low") },
|
||||
{ 3, N_("Normal") },
|
||||
@@ -383,7 +383,7 @@ namespace Exiv2 {
|
||||
unsigned long focusPoint = value.toLong(1);
|
||||
|
||||
switch (focusPoint) {
|
||||
// Could use array nikonFokuspoints
|
||||
// Could use array nikonFocuspoints
|
||||
case 0:
|
||||
case 1:
|
||||
case 2:
|
||||
@@ -583,7 +583,7 @@ namespace Exiv2 {
|
||||
{0x001e, "ColorSpace", N_("Color Space"), N_("Color space"), nikon3Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonColorSpace)},
|
||||
{0x001f, "VRInfo", N_("VR Info"), N_("VR info"), nikon3Id, makerTags, undefined, -1, printValue},
|
||||
{0x0020, "ImageAuthentication", N_("Image Authentication"), N_("Image authentication"), nikon3Id, makerTags, unsignedByte, -1, EXV_PRINT_TAG(nikonOffOn)},
|
||||
{0x0022, "ActiveDLighting", N_("ActiveD-Lighting"), N_("ActiveD-lighting"), nikon3Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonActiveDLighning)},
|
||||
{0x0022, "ActiveDLighting", N_("ActiveD-Lighting"), N_("ActiveD-lighting"), nikon3Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(nikonActiveDLighting)},
|
||||
{0x0023, "PictureControl", N_("Picture Control"), N_(" Picture control"), nikon3Id, makerTags, undefined, -1, printValue},
|
||||
{0x0024, "WorldTime", N_("World Time"), N_("World time"), nikon3Id, makerTags, undefined, -1, printValue},
|
||||
{0x0025, "ISOInfo", N_("ISO Info"), N_("ISO info"), nikon3Id, makerTags, undefined, -1, printValue},
|
||||
@@ -1710,7 +1710,7 @@ namespace Exiv2 {
|
||||
// What focuspoint did the user select?
|
||||
if (focuspoint < focuspoints) {
|
||||
os << nikonFocuspoints[focuspoint];
|
||||
// TODO: os << position[fokuspoint][combination]
|
||||
// TODO: os << position[focuspoint][combination]
|
||||
}
|
||||
else
|
||||
os << "(" << focuspoint << ")";
|
||||
@@ -1718,7 +1718,7 @@ namespace Exiv2 {
|
||||
sep = ',';
|
||||
}
|
||||
|
||||
// What fokuspoints(!) did the camera use? add if differs
|
||||
// What focuspoints(!) did the camera use? add if differs
|
||||
if (focusused == 0)
|
||||
os << sep << " " << _("none");
|
||||
else if (focusused != 1U<<focuspoint) {
|
||||
@@ -2620,7 +2620,7 @@ fmountlens[] = {
|
||||
{
|
||||
const unsigned char vid = static_cast<unsigned>(value.toLong(0));
|
||||
|
||||
/* the 'FMntLens' name is added to the annonymous struct for
|
||||
/* the 'FMntLens' name is added to the anonymous struct for
|
||||
* fmountlens[]
|
||||
*
|
||||
* remember to name the struct when importing/updating the lens info
|
||||
|
||||
@@ -78,7 +78,7 @@ namespace Exiv2 {
|
||||
static std::ostream& print0x1015(std::ostream& os, const Value& value, const ExifData*);
|
||||
//! Print Olympus equipment Lens type
|
||||
static std::ostream& print0x0201(std::ostream& os, const Value& value, const ExifData*);
|
||||
//! Print Olympus CamerID
|
||||
//! Print Olympus CameraID
|
||||
static std::ostream& print0x0209(std::ostream& os, const Value& value, const ExifData*);
|
||||
//! Print Olympus equipment Extender
|
||||
static std::ostream& printEq0x0301(std::ostream& os, const Value& value, const ExifData*);
|
||||
|
||||
@@ -467,7 +467,7 @@ namespace Exiv2 {
|
||||
{0x0040, "Saturation", N_("Saturation"), N_("Saturation"), panasonicId, makerTags, unsignedShort, -1, printValue},
|
||||
{0x0041, "Sharpness", N_("Sharpness"), N_("Sharpness"), panasonicId, makerTags, unsignedShort, -1, printValue},
|
||||
{0x0042, "FilmMode", N_("Film Mode"), N_("Film mode"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicFilmMode)},
|
||||
{0x0044, "ColorTempKelvin", N_("Color Temp Kelvin"), N_("Color Temperatur in Kelvin"), panasonicId, makerTags, unsignedShort, -1, printValue},
|
||||
{0x0044, "ColorTempKelvin", N_("Color Temp Kelvin"), N_("Color Temperature in Kelvin"), panasonicId, makerTags, unsignedShort, -1, printValue},
|
||||
{0x0045, "BracketSettings", N_("Bracket Settings"), N_("Bracket Settings"), panasonicId, makerTags, unsignedShort, -1, EXV_PRINT_TAG(panasonicBracketSettings)},
|
||||
{0x0046, "WBAdjustAB", N_("WB Adjust AB"), N_("WB adjust AB. Positive is a shift toward blue."), panasonicId, makerTags, unsignedShort, -1, printValue},
|
||||
{0x0047, "WBAdjustGM", N_("WB Adjust GM"), N_("WBAdjustGM. Positive is a shift toward green."), panasonicId, makerTags, unsignedShort, -1, printValue},
|
||||
@@ -601,7 +601,7 @@ namespace Exiv2 {
|
||||
|
||||
} // PanasonicMakerNote::print0x0029
|
||||
|
||||
// bage age
|
||||
// baby age
|
||||
std::ostream& PanasonicMakerNote::print0x0033(std::ostream& os,
|
||||
const Value& value,
|
||||
const ExifData*)
|
||||
|
||||
@@ -63,7 +63,7 @@ namespace Exiv2 {
|
||||
static std::ostream& printPressure(std::ostream& os, const Value& value, const ExifData*);
|
||||
//! Print special text values: title, landmark, county and so on
|
||||
static std::ostream& printPanasonicText(std::ostream& os, const Value& value, const ExifData*);
|
||||
//! Print accerometer readings
|
||||
//! Print accelerometer readings
|
||||
static std::ostream& printAccelerometer(std::ostream& os, const Value& value, const ExifData*);
|
||||
//! Print roll angle
|
||||
static std::ostream& printRollAngle(std::ostream& os, const Value& value, const ExifData*);
|
||||
|
||||
@@ -249,7 +249,7 @@ namespace Exiv2 {
|
||||
{ 0x109, N_("On, Slow-sync") },
|
||||
{ 0x10a, N_("On, Slow-sync, Red-eye reduction") },
|
||||
{ 0x10b, N_("On, Trailing-curtain Sync") },
|
||||
// exiftool recognises 2 values, the values here correpond with Value 0
|
||||
// exiftool recognises 2 values, the values here correspond with Value 0
|
||||
};
|
||||
|
||||
//! Focus, tag 0x000d
|
||||
|
||||
+1
-1
@@ -121,7 +121,7 @@ namespace Exiv2 {
|
||||
uint32_t headerSize = readPgfHeaderSize(*io_);
|
||||
readPgfHeaderStructure(*io_, pixelWidth_, pixelHeight_);
|
||||
|
||||
// And now, the most interresting, the user data byte array where metadata are stored as small image.
|
||||
// And now, the most interesting, the user data byte array where metadata are stored as small image.
|
||||
|
||||
enforce(headerSize <= std::numeric_limits<uint32_t>::max() - 8, kerCorruptedMetadata);
|
||||
#if LONG_MAX < UINT_MAX
|
||||
|
||||
@@ -354,7 +354,7 @@ namespace Exiv2
|
||||
}
|
||||
|
||||
// We look if a comments string exist. Note than we use only 'Description' keyword which
|
||||
// is dedicaced to store long comments. 'Comment' keyword is ignored.
|
||||
// is dedicated to store long comments. 'Comment' keyword is ignored.
|
||||
|
||||
if (keySize >= 11 && memcmp("Description", key, 11) == 0 && pImage->comment().empty()) {
|
||||
pImage->setComment(std::string(arr.c_str(), arr.size()));
|
||||
|
||||
+1
-1
@@ -594,7 +594,7 @@ namespace Exiv2 {
|
||||
return;
|
||||
}
|
||||
if (!strcmp(szChunk, "eXIf")) {
|
||||
; // do nothing Exif metdata is written following IHDR
|
||||
; // do nothing Exif metadata is written following IHDR
|
||||
; // as zTXt chunk with signature Raw profile type exif__
|
||||
} else if (!strcmp(szChunk, "IHDR")) {
|
||||
#ifdef EXIV2_DEBUG_MESSAGES
|
||||
|
||||
+2
-2
@@ -110,7 +110,7 @@ namespace {
|
||||
static PreviewId getNumLoaders();
|
||||
|
||||
protected:
|
||||
//! Constructor. Sets all image properies to unknown.
|
||||
//! Constructor. Sets all image properties to unknown.
|
||||
Loader(PreviewId id, const Image &image);
|
||||
|
||||
//! Functions that creates a loader from given parameters
|
||||
@@ -810,7 +810,7 @@ namespace {
|
||||
|
||||
// the size_ parameter is originally computed by summing all values inside sizes
|
||||
// see the constructor of LoaderTiff
|
||||
// But e.g in malicious files some of thes values could be negative
|
||||
// But e.g in malicious files some of these values could be negative
|
||||
// That's why we check again for each step here to really make sure we don't overstep
|
||||
enforce(Safe::add(idxBuf, size) <= size_, kerCorruptedMetadata);
|
||||
if (size!=0 && Safe::add(offset, size) <= static_cast<uint32_t>(io.size())){
|
||||
|
||||
+2
-2
@@ -262,7 +262,7 @@ namespace Exiv2 {
|
||||
"intended to give human readers a general indication of the steps taken to make the "
|
||||
"changes from the previous version to this one. The list should be at an abstract "
|
||||
"level; it is not intended to be an exhaustive keystroke or other detailed history.") },
|
||||
{ "Ingredients", N_("Ingredients"), "bag ResourceRef", xmpBag, xmpInternal, N_("References to resources that were incorporated, byinclusion or reference, into this resource.") },
|
||||
{ "Ingredients", N_("Ingredients"), "bag ResourceRef", xmpBag, xmpInternal, N_("References to resources that were incorporated, by inclusion or reference, into this resource.") },
|
||||
{ "InstanceID", N_("Instance ID"), "URI", xmpText, xmpInternal, N_("An identifier for a specific incarnation of a document, updated each time a file "
|
||||
"is saved. It should be based on a UUID; see Document and Instance IDs below.") },
|
||||
{ "ManagedFrom", N_("Managed From"), "ResourceRef", xmpText, xmpInternal, N_("A reference to the document as it was prior to becoming managed. It is set when a "
|
||||
@@ -4161,7 +4161,7 @@ namespace Exiv2 {
|
||||
|
||||
@throw Error if the key cannot be decomposed.
|
||||
*/
|
||||
void decomposeKey(const std::string& key); //!< Misterious magic
|
||||
void decomposeKey(const std::string& key); //!< Mysterious magic
|
||||
|
||||
// DATA
|
||||
static constexpr auto familyName_ = "Xmp"; //!< "Xmp"
|
||||
|
||||
+1
-1
@@ -303,7 +303,7 @@ namespace Exiv2 {
|
||||
8 4 bytes height Height of thumbnail in pixels.
|
||||
12 4 bytes widthbytes Padded row bytes as (width * bitspixel + 31) / 32 * 4.
|
||||
16 4 bytes size Total size as widthbytes * height * planes
|
||||
20 4 bytes compressedsize Size after compression. Used for consistentcy check.
|
||||
20 4 bytes compressedsize Size after compression. Used for consistency check.
|
||||
24 2 bytes bitspixel = 24. Bits per pixel.
|
||||
26 2 bytes planes = 1. Number of planes.
|
||||
28 variable data JFIF data in RGB format.
|
||||
|
||||
+1
-1
@@ -1657,7 +1657,7 @@ namespace Exiv2 {
|
||||
N_("A string that identifies a specific instance in a semantic mask."),
|
||||
ifd0Id, dngTags, asciiString, 0, printValue}, // DNG 1.6 tag
|
||||
{0xcd31, "CalibrationIlluminant3", N_("Calibration Illuminant 3"),
|
||||
N_("The illuminant used for an optional thrid set of color calibration "
|
||||
N_("The illuminant used for an optional third set of color calibration "
|
||||
"tags (ColorMatrix3, CameraCalibration3, ReductionMatrix3). The legal "
|
||||
"values for this tag are the same as the legal values for the "
|
||||
"LightSource EXIF tag; CalibrationIlluminant1 and CalibrationIlluminant2 "
|
||||
|
||||
@@ -844,7 +844,7 @@ namespace Exiv2 {
|
||||
|
||||
void TiffEncoder::visitBinaryElement(TiffBinaryElement* object)
|
||||
{
|
||||
// Temporarily overwrite byteorder according to that of the binary element
|
||||
// Temporarily overwrite byte order according to that of the binary element
|
||||
ByteOrder boOrig = byteOrder_;
|
||||
if (object->elByteOrder() != invalidByteOrder) byteOrder_ = object->elByteOrder();
|
||||
encodeTiffComponent(object);
|
||||
|
||||
@@ -533,7 +533,7 @@ namespace Exiv2 {
|
||||
static uint32_t updateDirEntry(byte* buf, ByteOrder byteOrder, TiffComponent* pTiffComponent);
|
||||
/*!
|
||||
@brief Check if the tag is an image tag of an existing image. Such
|
||||
tags are copied from the original image and can't be modifed.
|
||||
tags are copied from the original image and can't be modified.
|
||||
|
||||
The condition is true if there is an existing image (as
|
||||
opposed to a newly created TIFF image) and \em tag, \em group
|
||||
|
||||
+3
-3
@@ -208,14 +208,14 @@ namespace Exiv2 {
|
||||
height = Exiv2::getULong(size_buf, littleEndian) + 1;
|
||||
}
|
||||
|
||||
/* Chunk with with animation control data. */
|
||||
/* Chunk with animation control data. */
|
||||
#ifdef __CHECK_FOR_ALPHA__ // Maybe in the future
|
||||
if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_ANIM) && !has_alpha) {
|
||||
has_alpha = true;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Chunk with with lossy image data. */
|
||||
/* Chunk with lossy image data. */
|
||||
#ifdef __CHECK_FOR_ALPHA__ // Maybe in the future
|
||||
if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8) && !has_alpha) {
|
||||
has_alpha = true;
|
||||
@@ -238,7 +238,7 @@ namespace Exiv2 {
|
||||
height = Exiv2::getUShort(size_buf, littleEndian) & 0x3fff;
|
||||
}
|
||||
|
||||
/* Chunk with with lossless image data. */
|
||||
/* Chunk with lossless image data. */
|
||||
if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8L) && !has_alpha) {
|
||||
enforce(size >= 5, Exiv2::kerCorruptedMetadata);
|
||||
if ((payload.read_uint8(4) & WEBP_VP8X_ALPHA_BIT) == WEBP_VP8X_ALPHA_BIT) {
|
||||
|
||||
Reference in New Issue
Block a user