Project

General

Profile

Patch #1029 ยป Fix-typos.patch

Thomas Beutlich, 11 Feb 2015 20:32

View differences:

config/config.h.cmake (working copy)
208 208
#define EXV_HAVE_GXXCLASSVISIBILITY
209 209
#endif
210 210
     
211
/* File path seperator */
211
/* File path separator */
212 212
#if defined(WIN32) && !defined(__CYGWIN__)
213
#define EXV_SEPERATOR_STR "\\"
214
#define EXV_SEPERATOR_CHR '\\'
213
#define EXV_SEPARATOR_STR "\\"
214
#define EXV_SEPARATOR_CHR '\\'
215 215
#else
216
#define EXV_SEPERATOR_STR "/"
217
#define EXV_SEPERATOR_CHR '/'
216
#define EXV_SEPARATOR_STR "/"
217
#define EXV_SEPARATOR_CHR '/'
218 218
#endif
219 219

  
220 220
/* Shared library support, see http://gcc.gnu.org/wiki/Visibility */
contrib/organize/organize.cpp (working copy)
349 349
    po::options_description hidden("Hidden Options");
350 350
    hidden.add_options()
351 351
        ("source-dir", po::value< std::string >(), "directory of files to organize, may end in file wildcard")
352
        ("dest-dir", po::value< std::string >(), "desination directory for files, may not be within source-dir")
352
        ("dest-dir", po::value< std::string >(), "designation directory for files, may not be within source-dir")
353 353
        ("pattern", po::value< std::string >(), "subdirectory pattern for grouping files within dest-dir")
354 354
        ;
355 355

  
include/exiv2/actions.hpp (working copy)
134 134
          prototype is replaced.
135 135

  
136 136
          @param type Task type.
137
          @param task Pointer to the prototype. Ownership is transfered to the
137
          @param task Pointer to the prototype. Ownership is transferred to the
138 138
                 task factory. That's what the auto pointer indicates.
139 139
        */
140 140
        void registerTask(TaskType type, Task::AutoPtr task);
......
356 356

  
357 357
    private:
358 358
        virtual Modify* clone_() const;
359
        //! Copy contructor needed because of AutoPtr member
359
        //! Copy constructor needed because of AutoPtr member
360 360
        Modify(const Modify& /*src*/) : Task() {}
361 361

  
362 362
        //! Add a metadatum to \em pImage according to \em modifyCmd
include/exiv2/basicio.hpp (working copy)
792 792
    class EXIV2API XPathIo : public FileIo {
793 793
    public:
794 794
        /*!
795
            @brief The extention of the temporary file which is created when getting input data
795
            @brief The extension of the temporary file which is created when getting input data
796 796
                    to read metadata. This file will be deleted in destructor.
797 797
        */
798 798
        static const std::string TEMP_FILE_EXT;
799 799
        /*!
800
            @brief The extention of the generated file which is created when getting input data
800
            @brief The extension of the generated file which is created when getting input data
801 801
                    to add or modify the metadata.
802 802
        */
803 803
        static const std::string GEN_FILE_EXT;
include/exiv2/exv_msvc-webready.h (working copy)
111 111
#pragma comment(lib, "ws2_32.lib")
112 112
#pragma comment(lib, "wldap32.lib")
113 113

  
114
/* File path seperator */
115
#define EXV_SEPERATOR_STR "\\"
116
#define EXV_SEPERATOR_CHR '\\'
114
/* File path separator */
115
#define EXV_SEPARATOR_STR "\\"
116
#define EXV_SEPARATOR_CHR '\\'
117 117

  
118 118
/* Windows unicode path support */
119 119
// #define EXV_UNICODE_PATH
include/exiv2/exv_msvc.h (working copy)
111 111
#pragma comment(lib, "ws2_32.lib")
112 112
#pragma comment(lib, "wldap32.lib")
113 113

  
114
/* File path seperator */
115
#define EXV_SEPERATOR_STR "\\"
116
#define EXV_SEPERATOR_CHR '\\'
114
/* File path separator */
115
#define EXV_SEPARATOR_STR "\\"
116
#define EXV_SEPARATOR_CHR '\\'
117 117

  
118 118
/* Windows unicode path support */
119 119
// #define EXV_UNICODE_PATH
include/exiv2/utilsvideo.hpp (working copy)
36 36
public:
37 37
    static bool compareTagValue(Exiv2::DataBuf &buf, const char *str);
38 38
    static bool compareTagValue(Exiv2::DataBuf& buf,const char arr[][5],int32_t arraysize);
39
    static bool simpleBytesComparision(Exiv2::DataBuf& buf ,const char* str,int32_t size);
39
    static bool simpleBytesComparison(Exiv2::DataBuf& buf ,const char* str,int32_t size);
40 40
}; // class UtilsVideo
41 41

  
42 42
} // namespace Exiv2
msvc2003/exivsimple/exivsimple.cpp (working copy)
353 353
    return rc;
354 354
}
355 355

  
356
// If multiple entires exist, this only remove the first one
356
// If multiple entries exist, this only remove the first one
357 357
// found. Call multiple times to remove many.
358 358
// Returns 0 on success
359 359
EXIVSIMPLE_API int RemoveMeta(HIMAGE img, const char *key)
msvc2005/tools/depends/src/depends.cpp (working copy)
85 85
	LPCTSTR base = pModule->GetBaseName() ;
86 86
    LPCTSTR result = base ;
87 87
    if ( bQuiet ) {
88
        // keep quiet about these guys - they're build/compiler dependant
88
        // keep quiet about these guys - they're build/compiler dependent
89 89
	    if (   _strnicmp(base,"MSVCR",5) == 0 ) result = NULL ;
90 90
	    if (   _strnicmp(base,"MSVCP",5) == 0 ) result = NULL ;
91 91
	    if (   _strnicmp(base,"API-MS-Win",10) == 0 ) result = NULL ;
msvc2005/tools/issue984/issue984.cpp (working copy)
3 3

  
4 4
int main(int argc, char** argv)
5 5
{
6
    printf("Opening file '%s' with FILE_SHARE_DELETE acess...\n", argv[1]);
6
    printf("Opening file '%s' with FILE_SHARE_DELETE access...\n", argv[1]);
7 7

  
8
    HANDLE hFile = CreateFile(argv[1], GENERIC_READ,
8
    HANDLE hFile = CreateFileA(argv[1], GENERIC_READ,
9 9
            FILE_SHARE_DELETE|FILE_SHARE_READ|FILE_SHARE_WRITE,
10 10
            NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
11 11

  
msvc2005/tools/rm/rm.cpp (working copy)
195 195
 * option is TRUE, directories will be recursively emptied then deleted.
196 196
 * If force is TRUE, file attributes will be changed to allow the program
197 197
 * to delete the file.  The verbose option will cause non-fatal error messages
198
 * to print to stderr.  The quiet option will supress all but fatal
198
 * to print to stderr.  The quiet option will suppress all but fatal
199 199
 * error messages
200 200
 */
201 201
BOOL del(wchar_t* name, BOOL recurse, BOOL force, BOOL verbose, BOOL quiet) {
samples/geotag.cpp (working copy)
451 451

  
452 452
std::string makePath(std::string dir,std::string file)
453 453
{
454
    return dir + std::string(EXV_SEPERATOR_STR) + file ;
454
    return dir + std::string(EXV_SEPARATOR_STR) + file ;
455 455
}
456 456

  
457 457
const char* makePath(const char* dir,const char* file)
src/actions.cpp (working copy)
1916 1916
                      << path << "\n";
1917 1917
            return 1;
1918 1918
        }
1919
        newPath =   Util::dirname(path) + EXV_SEPERATOR_STR
1919
        newPath =   Util::dirname(path) + EXV_SEPARATOR_STR
1920 1920
                  + basename + Util::suffix(path);
1921 1921
        if (   Util::dirname(newPath)  == Util::dirname(path)
1922 1922
            && Util::basename(newPath) == Util::basename(path)) {
......
1939 1939
                    break;
1940 1940
                case Params::renamePolicy:
1941 1941
                    newPath = Util::dirname(path)
1942
                        + EXV_SEPERATOR_STR + basename
1942
                        + EXV_SEPARATOR_STR + basename
1943 1943
                        + "_" + Exiv2::toString(seq++)
1944 1944
                        + Util::suffix(path);
1945 1945
                    break;
......
1958 1958
                    case 'R':
1959 1959
                        fileExistsPolicy = Params::renamePolicy;
1960 1960
                        newPath = Util::dirname(path)
1961
                            + EXV_SEPERATOR_STR + basename
1961
                            + EXV_SEPARATOR_STR + basename
1962 1962
                            + "_" + Exiv2::toString(seq++)
1963 1963
                            + Util::suffix(path);
1964 1964
                        break;
......
1998 1998
    {
1999 1999
        std::string directory = Params::instance().directory_;
2000 2000
        if (directory.empty()) directory = Util::dirname(path);
2001
        std::string newPath =   directory + EXV_SEPERATOR_STR
2001
        std::string newPath =   directory + EXV_SEPARATOR_STR
2002 2002
                              + Util::basename(path, true) + ext;
2003 2003
        return newPath;
2004 2004
    }
src/jp2image.cpp (working copy)
171 171
#ifdef DEBUG
172 172
            std::cout << "Exiv2::Jp2Image::readMetadata: Position: " << position << "\n";
173 173
            std::cout << "Exiv2::Jp2Image::readMetadata: Find box type: " << std::string((const char*)&box.boxType)
174
                      << " lenght: " << box.boxLength << "\n";
174
                      << " length: " << box.boxLength << "\n";
175 175
#endif
176 176
            box.boxType   = getLong((byte*)&box.boxType, bigEndian);
177 177

  
......
415 415

  
416 416
#ifdef DEBUG
417 417
            std::cout << "Exiv2::Jp2Image::doWriteMetadata: Find box type: " << bheaderBuf.pData_ + 4
418
                      << " lenght: " << box.boxLength << "\n";
418
                      << " length: " << box.boxLength << "\n";
419 419
#endif
420 420

  
421 421
            if (box.boxLength == 0)
......
459 459
                {
460 460

  
461 461
#ifdef DEBUG
462
                    std::cout << "Exiv2::Jp2Image::doWriteMetadata: Write JP2Header box (lenght: " << box.boxLength << ")\n";
462
                    std::cout << "Exiv2::Jp2Image::doWriteMetadata: Write JP2Header box (length: " << box.boxLength << ")\n";
463 463
#endif
464 464
                    if (outIo.write(boxBuf.pData_, boxBuf.size_) != boxBuf.size_) throw Error(21);
465 465

  
......
488 488
                            memcpy(boxData.pData_ + 8 + 16, rawExif.pData_, rawExif.size_);
489 489

  
490 490
#ifdef DEBUG
491
                            std::cout << "Exiv2::Jp2Image::doWriteMetadata: Write box with Exif metadata (lenght: "
491
                            std::cout << "Exiv2::Jp2Image::doWriteMetadata: Write box with Exif metadata (length: "
492 492
                                      << boxData.size_ << ")\n";
493 493
#endif
494 494
                            if (outIo.write(boxData.pData_, boxData.size_) != boxData.size_) throw Error(21);
......
511 511
                            memcpy(boxData.pData_ + 8 + 16, rawIptc.pData_, rawIptc.size_);
512 512

  
513 513
#ifdef DEBUG
514
                            std::cout << "Exiv2::Jp2Image::doWriteMetadata: Write box with Iptc metadata (lenght: "
514
                            std::cout << "Exiv2::Jp2Image::doWriteMetadata: Write box with Iptc metadata (length: "
515 515
                                      << boxData.size_ << ")\n";
516 516
#endif
517 517
                            if (outIo.write(boxData.pData_, boxData.size_) != boxData.size_) throw Error(21);
......
541 541
                        memcpy(boxData.pData_ + 8 + 16, xmp.pData_,   xmp.size_);
542 542

  
543 543
#ifdef DEBUG
544
                        std::cout << "Exiv2::Jp2Image::doWriteMetadata: Write box with XMP metadata (lenght: "
544
                        std::cout << "Exiv2::Jp2Image::doWriteMetadata: Write box with XMP metadata (length: "
545 545
                                  << boxData.size_ << ")\n";
546 546
#endif
547 547
                        if (outIo.write(boxData.pData_, boxData.size_) != boxData.size_) throw Error(21);
......
583 583
                default:
584 584
                {
585 585
#ifdef DEBUG
586
                    std::cout << "Exiv2::Jp2Image::doWriteMetadata: write box (lenght: " << box.boxLength << ")\n";
586
                    std::cout << "Exiv2::Jp2Image::doWriteMetadata: write box (length: " << box.boxLength << ")\n";
587 587
#endif
588 588
                    if (outIo.write(boxBuf.pData_, boxBuf.size_) != boxBuf.size_) throw Error(21);
589 589

  
src/preview.cpp (working copy)
767 767
        for (ExifData::const_iterator pos = exifData.begin(); pos != exifData.end(); ++pos) {
768 768
            if (pos->groupName() == group_) {
769 769
                /*
770
                   Write only the neccessary TIFF image tags
770
                   Write only the necessary TIFF image tags
771 771
                   tags that especially could cause problems are:
772 772
                   "NewSubfileType" - the result is no longer a thumbnail, it is a standalone image
773 773
                   "Orientation" - this tag typically appears only in the "Image" group. Deleting it ensures
src/properties.cpp (working copy)
1373 1373
        { "MediaLangCode",      N_("Media Language Code"),          "Integer",               xmpText, xmpExternal, N_("A 16-bit integer that specifies the language code for this media.")   },
1374 1374
        { "MediaModifyDate",    N_("Media Track Modify Date"),      "Integer",               xmpText, xmpExternal, N_("A 32-bit integer that indicates (in seconds since midnight, January 1, 1904) when the media header was last modified.")   },
1375 1375
        { "MediaTimeScale",     N_("Media Time Scale"),             "Integer",               xmpText, xmpExternal, N_("A time value that indicates the time scale for this media-that is, the number of time units that pass per second in its time coordinate system." )   },
1376
        { "OutputSampleRate",   N_("Output Audio Sample Rate"),     "Integer",               xmpText, xmpExternal, N_("The ouput audio sample rate. Can be any value, but commonly 32000, 41100, or 48000.") },
1376
        { "OutputSampleRate",   N_("Output Audio Sample Rate"),     "Integer",               xmpText, xmpExternal, N_("The output audio sample rate. Can be any value, but commonly 32000, 41100, or 48000.") },
1377 1377
        { "SampleCount",        N_("Audio Sample Count"),           "Integer",               xmpText, xmpExternal, N_("Sample taken for Analyzing Audio Stream")   },
1378 1378
        { "SampleRate",         N_("Audio Sample Rate"),            "Integer",               xmpText, xmpExternal, N_("The audio sample rate. Can be any value, but commonly 32000, 41100, or 48000.") },
1379 1379
        { "SampleType",         N_("Audio Sample Type"),            "closed Choice of Text", xmpText, xmpExternal, N_("The audio sample type. One of: 8Int, 16Int, 32Int, 32Float.") },
......
1438 1438
                                                N_("A list (concatenated and separated) of additional measurements, facts, characteristics, or assertions about the record. Meant to provide a mechanism for structured content such as key-value pairs.")
1439 1439
            },
1440 1440

  
1441
        // Occurence Level Class
1442
        { "Occurence",                      N_("Occurence"),                         "Occurence",    xmpText,   xmpInternal, 
1441
        // Occurrence Level Class
1442
        { "Occurrence",                      N_("Occurrence"),                         "Occurrence",    xmpText,   xmpInternal, 
1443 1443
                                            N_("The category of information pertaining to evidence of an occurrence in nature, in a collection, or in a dataset (specimen, observation, etc.)."),
1444 1444
        },
1445
            // Occurence Level Terms
1445
            // Occurrence Level Terms
1446 1446
            { "occurrenceID",                   N_("Occurrence ID"),                        "Text",      xmpText,   xmpExternal,      
1447 1447
                                                N_("An identifier for the Occurrence (as opposed to a particular digital record of the occurrence). In the absence of a persistent global unique identifier, construct one from a combination of identifiers in the record that will most closely make the occurrenceID globally unique.")
1448 1448
            },
......
1537 1537
                                                N_("The amount of effort expended during an Event.")
1538 1538
            },
1539 1539
            { "Date",                           N_("Event Date"),                  "Date",      xmpText,    xmpExternal,      
1540
                                                N_("The date-time or interval during which an Event occured. For occurrences, this is the date-time when the event was recorded. Not suitable for a time in a geological context. Recommended best practice is to use an encoding scheme, such as ISO 8601:2004(E).")
1540
                                                N_("The date-time or interval during which an Event occurred. For occurrences, this is the date-time when the event was recorded. Not suitable for a time in a geological context. Recommended best practice is to use an encoding scheme, such as ISO 8601:2004(E).")
1541 1541
            },
1542 1542
            { "earliestDate",                   N_("Event Earliest Date"),                  "Date",      xmpText,    xmpExternal,      
1543 1543
                                                N_("The date-time or interval during which an Event started. For occurrences, this is the date-time when the event was recorded. Not suitable for a time in a geological context. Recommended best practice is to use an encoding scheme, such as ISO 8601:2004(E).")
src/psdimage.cpp (working copy)
195 195
            throw Error(3, "Photoshop");
196 196
        }
197 197

  
198
        // after the color data section, comes a list of resource blocks, preceeded by the total byte size
198
        // after the color data section, comes a list of resource blocks, preceded by the total byte size
199 199
        if (io_->read(buf, 4) != 4)
200 200
        {
201 201
            throw Error(3, "Photoshop");
src/sonymn.cpp (working copy)
461 461
                N_("Release Mode"),
462 462
                sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyReleaseMode)),
463 463
        TagInfo(0xB04A, "SequenceNumber", N_("Sequence Number"),
464
                N_("Shot number in continous burst mode"),
464
                N_("Shot number in continuous burst mode"),
465 465
                sony1Id, makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonySequenceNumber)),
466 466
        TagInfo(0xB04B, "AntiBlur", N_("Anti-Blur"),
467 467
                N_("Anti-Blur"),
src/tags.cpp (working copy)
299 299
        { 34892, N_("Linear Raw")         }
300 300
    };
301 301

  
302
    //! Threshholding, tag 0x0107
303
    extern const TagDetails exifThreshholding[] = {
302
    //! Thresholding, tag 0x0107
303
    extern const TagDetails exifThresholding[] = {
304 304
        { 1, N_("No dithering or halftoning")           },
305 305
        { 2, N_("Ordered dither or halftone technique") },
306 306
        { 3, N_("Randomized process")                   }
......
441 441
                N_("The pixel composition. In JPEG compressed data a JPEG "
442 442
                "marker is used instead of this tag."),
443 443
                ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifPhotometricInterpretation)),
444
        TagInfo(0x0107, "Threshholding", N_("Threshholding"),
444
        TagInfo(0x0107, "Thresholding", N_("Thresholding"),
445 445
                N_("For black and white TIFF files that represent shades of gray, "
446 446
                   "the technique used to convert from gray to black and white pixels."),
447
                ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifThreshholding)), // TIFF tag
447
                ifd0Id, imgStruct, unsignedShort, 1, EXV_PRINT_TAG(exifThresholding)), // TIFF tag
448 448
        TagInfo(0x0108, "CellWidth", N_("Cell Width"),
449 449
                N_("The width of the dithering or halftoning matrix used to create a "
450 450
                   "dithered or halftoned bilevel file."),
src/utils.hpp (working copy)
161 161
    bool strtol(const char* nptr, long& n);
162 162

  
163 163
    /*!
164
      @brief Replaces all occurences of \em searchText in the \em text string
164
      @brief Replaces all occurrences of \em searchText in the \em text string
165 165
             by \em replaceText.
166 166
     */
167 167
    void replace(std::string& text, const std::string& searchText, const std::string& replaceText);
src/utilsvideo.cpp (working copy)
50 50
    return result;
51 51
}
52 52

  
53
bool UtilsVideo::simpleBytesComparision(Exiv2::DataBuf& buf ,const char* str,int32_t size){
53
bool UtilsVideo::simpleBytesComparison(Exiv2::DataBuf& buf ,const char* str,int32_t size){
54 54
    for(int32_t i=0; i<size; i++ )
55 55
        if(toupper(buf.pData_[i]) != str[i])
56 56
            return false;
xmpsdk/include/TXMPIterator.hpp (working copy)
62 62
/// are visited next. The fields of a struct or items of an array are visited after the qualifiers
63 63
/// of the parent.
64 64
///
65
/// You can specify options when contructing the iteration object to control how the iteration is
65
/// You can specify options when constructing the iteration object to control how the iteration is
66 66
/// performed.
67 67
///
68 68
///   \li \c #kXMP_IterJustChildren - Visit just the immediate children of the root. Skip the root
xmpsdk/include/TXMPUtils.hpp (working copy)
857 857
    ///   internal. You can use this flag together with \c #kXMPUtil_ReplaceOldValues to replace the
858 858
    ///   values of existing top-level properties.
859 859
    ///
860
    ///   \li \c #kXMPUtil_ReplaceOldValues: Propogate all top-level properties from the source to
860
    ///   \li \c #kXMPUtil_ReplaceOldValues: Propagate all top-level properties from the source to
861 861
    ///   the destination, replacing any existing values. The values of properties in the
862 862
    ///   destination that are not in the source are not modified.<br>
863 863
    ///   The keep-or-replace-old notion also applies within structs and arrays. Top-level
xmpsdk/src/ParseRDF.cpp (working copy)
846 846
// are distinguished by their XML element content.
847 847
//
848 848
// NOTE: The RDF syntax does not explicitly include the xml:lang attribute although it can appear in
849
// many of these. We have to allow for it in the attibute counts below.
849
// many of these. We have to allow for it in the attribute counts below.
850 850

  
851 851
static void
852 852
RDF_PropertyElement ( XMP_Node * xmpParent, const XML_Node & xmlNode, bool isTopLevel )
xmpsdk/src/XMPIterator.cpp (working copy)
241 241
		} else {
242 242
			
243 243
			// -------------------------------------------------------------------------------------------
244
			// Decide what to do with this iteration node based on its state. Don't use a switch statment,
244
			// Decide what to do with this iteration node based on its state. Don't use a switch statement,
245 245
			// some of the cases want to break from the loop. A break in a switch just exits the case.
246 246
			
247 247
			#if TraceIterators
xmpsdk/src/XMPMeta-Parse.cpp (working copy)
1167 1167
			
1168 1168
				// We've got some leftover input, process it first then continue with the current
1169 1169
				// buffer. Try to fill the pendingInput buffer before parsing further. We use a loop
1170
				// for wierd edge cases like a 2 byte input buffer, using 1 byte for pendingInput,
1170
				// for weird edge cases like a 2 byte input buffer, using 1 byte for pendingInput,
1171 1171
				// then having a partial UTF-8 end and need to absorb more.
1172 1172
				
1173 1173
				size_t pendingOverlap = kXMLPendingInputMax - parser.pendingCount;
xmpsdk/src/XMPUtils-FileInfo.cpp (working copy)
845 845
	if ( arrayNode->children.empty() ) goto EXIT;	// ! Need to set the output pointer and length.
846 846
	
847 847
	// Build the result, quoting the array items, adding separators. Hurl if any item isn't simple.
848
	// Start the result with the first value, then add the rest with a preceeding separator.
848
	// Start the result with the first value, then add the rest with a preceding separator.
849 849
	
850 850
	currItem = arrayNode->children[0];
851 851
	
    (1-1/1)