diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2014-12-04 20:10:15 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-12-04 20:10:15 (GMT) |
commit | 33cdac235fa71cf3ee60127810cac9e5d79f9f4b (patch) | |
tree | 6bb5f448a25ef4e27450542b70a80dea9ca224ce | |
parent | 3b10b5b61a190018a46a05793d6c179e5fe3ea3b (diff) | |
parent | 8ff67ad01abfe97b43de0ef1799c8b798d725ab9 (diff) | |
download | Doxygen-33cdac235fa71cf3ee60127810cac9e5d79f9f4b.zip Doxygen-33cdac235fa71cf3ee60127810cac9e5d79f9f4b.tar.gz Doxygen-33cdac235fa71cf3ee60127810cac9e5d79f9f4b.tar.bz2 |
Merge pull request #255 from orbitcowboy/master
Fixed typos in comments.
-rw-r--r-- | src/entry.cpp | 2 | ||||
-rw-r--r-- | src/lodepng.cpp | 10 | ||||
-rw-r--r-- | src/rtfstyle.h | 2 | ||||
-rw-r--r-- | src/vhdldocgen.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/entry.cpp b/src/entry.cpp index 9f863d2..b5928b3 100644 --- a/src/entry.cpp +++ b/src/entry.cpp @@ -170,7 +170,7 @@ Entry::Entry(const Entry &e) anchors->append(new SectionInfo(*s)); } - // deep copy type contraint list + // deep copy type constraint list if (e.typeConstr) { typeConstr = e.typeConstr->deepCopy(); diff --git a/src/lodepng.cpp b/src/lodepng.cpp index 46011a8..084f1c8 100644 --- a/src/lodepng.cpp +++ b/src/lodepng.cpp @@ -1406,7 +1406,7 @@ static unsigned deflateDynamic(ucvector* out, const unsigned char* data, size_t for(i = 0; i < numcodes; i++) uivector_push_back(&lldll, HuffmanTree_getLength(&codes, (unsigned)i)); for(i = 0; i < numcodesD; i++) uivector_push_back(&lldll, HuffmanTree_getLength(&codesD, (unsigned)i)); - /*make lldl smaller by using repeat codes 16 (copy length 3-6 times), 17 (3-10 zeroes), 18 (11-138 zeroes)*/ + /*make lldl smaller by using repeat codes 16 (copy length 3-6 times), 17 (3-10 zeros), 18 (11-138 zeros)*/ for(i = 0; i < (unsigned)lldll.size; i++) { unsigned j = 0; @@ -2547,7 +2547,7 @@ unsigned LodePNG_convert(unsigned char* out, const unsigned char* in, LodePNG_In return 0; } -/*Paeth predicter, used by PNG filter type 4*/ +/*Path predictor, used by PNG filter type 4*/ static int paethPredictor(int a, int b, int c) { int p = a + b - c; @@ -2795,7 +2795,7 @@ static unsigned postProcessScanlines(unsigned char* out, unsigned char* in, cons { /* This function converts the filtered-padded-interlaced data into pure 2D image buffer with the PNG's colortype. Steps: - *) if no Adam7: 1) unfilter 2) remove padding bits (= posible extra bits per scanline if bpp < 8) + *) if no Adam7: 1) unfilter 2) remove padding bits (= possible extra bits per scanline if bpp < 8) *) if adam7: 1) 7x unfilter 2) 7x remove padding bits 3) Adam7_deinterlace NOTE: the in buffer will be overwritten with intermediate data! */ @@ -3763,7 +3763,7 @@ static unsigned preProcessScanlines(unsigned char** out, size_t* outsize, const { /* This function converts the pure 2D image with the PNG's colortype, into filtered-padded-interlaced data. Steps: - *) if no Adam7: 1) add padding bits (= posible extra bits per scanline if bpp < 8) 2) filter + *) if no Adam7: 1) add padding bits (= possible extra bits per scanline if bpp < 8) 2) filter *) if adam7: 1) Adam7_interlace 2) 7x add padding bits 3) 7x filter */ unsigned bpp = LodePNG_InfoColor_getBpp(&infoPng->color); @@ -3791,7 +3791,7 @@ static unsigned preProcessScanlines(unsigned char** out, size_t* outsize, const } ucvector_cleanup(&padded); } - else error = filter(*out, in, w, h, &infoPng->color); /*we can immediatly filter into the out buffer, no other steps needed*/ + else error = filter(*out, in, w, h, &infoPng->color); /*we can immediately filter into the out buffer, no other steps needed*/ } } else /*interlaceMethod is 1 (Adam7)*/ diff --git a/src/rtfstyle.h b/src/rtfstyle.h index 4f0a03f..ae7e456 100644 --- a/src/rtfstyle.h +++ b/src/rtfstyle.h @@ -65,7 +65,7 @@ struct StyleData unsigned index; // index in style-sheet, i.e. number in s-clause char* reference; // everything required to apply the style - char* definition; // aditional tags like \snext and style name + char* definition; // additional tags like \snext and style name StyleData(const char* reference, const char* definition); ~StyleData(); diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp index a4e9906..3f7cd1d 100644 --- a/src/vhdldocgen.cpp +++ b/src/vhdldocgen.cpp @@ -737,7 +737,7 @@ MemberDef* VhdlDocGen::findMember(const QCString& className, const QCString& mem if (mdef) return mdef; // nothing found so far - // if we are an architecture or package body search in entitiy + // if we are an architecture or package body search in entity if ((VhdlDocGen::VhdlClasses)cd->protection()==VhdlDocGen::ARCHITECTURECLASS || (VhdlDocGen::VhdlClasses)cd->protection()==VhdlDocGen::PACKBODYCLASS) |