diff options
| -rw-r--r-- | README-maintainer | 2 | ||||
| -rw-r--r-- | include/qpdf/QPDFPageObjectHelper.hh | 4 | ||||
| -rw-r--r-- | ispell-words | 105 | ||||
| -rw-r--r-- | libqpdf/QPDFPageObjectHelper.cc | 8 | ||||
| -rw-r--r-- | manual/qpdf-manual.xml | 10 | ||||
| -rw-r--r-- | qpdf/qpdf.cc | 4 | ||||
| -rw-r--r-- | qpdf/test_driver.cc | 4 |
7 files changed, 118 insertions, 19 deletions
diff --git a/README-maintainer b/README-maintainer index 158646aa..9e5b6ed5 100644 --- a/README-maintainer +++ b/README-maintainer @@ -40,7 +40,7 @@ RELEASE PREPARATION * Run a spelling checker over the source code to catch errors in variable names, strings, and comments. - ispell -p ispell-words **/*.hh **/*.cc manual/* ChangeLog README* + ispell -p ispell-words **/*.hh **/*.cc manual/* ChangeLog README* TODO * If needed, run large file and image comparison tests. Configure options: diff --git a/include/qpdf/QPDFPageObjectHelper.hh b/include/qpdf/QPDFPageObjectHelper.hh index adf7cbda..d7291723 100644 --- a/include/qpdf/QPDFPageObjectHelper.hh +++ b/include/qpdf/QPDFPageObjectHelper.hh @@ -174,8 +174,8 @@ class QPDFPageObjectHelper: public QPDFObjectHelper // to be inserted into the same or a different QPDF object using // any of the addPage methods in QPDFPageDocumentHelper or QPDF. // Without calling one of those methods, the page will not be - // added anywhere. Thew new page object shares all content streams - // and indirect objet resources with the original page, so if you + // added anywhere. The new page object shares all content streams + // and indirect object resources with the original page, so if you // are going to modify the contents or other aspects of the page, // you will need to handling copying of the component parts // separately. diff --git a/ispell-words b/ispell-words index 74e4340b..9d60b74d 100644 --- a/ispell-words +++ b/ispell-words @@ -19,6 +19,7 @@ accessor aclocal AcroForm acroform +acroread activatePipelineStack ActiveState acyclic @@ -79,6 +80,7 @@ appearancestate appendable appendItem appendString +appian AppImage appimage arandom @@ -100,6 +102,8 @@ argEmpty argEncrypt argEncryptionFilePassword argEndEncrypt +argEndUnderOverlay +argExternalizeInlineImages argfile argFilteredStreamData argFlattenAnnotations @@ -107,11 +111,13 @@ argForceVersion argGenerateAppearances argHelp argIgnoreXrefStreams +argIiMinBytes argJson argJsonHelp argJsonKey argJsonObject argKeepFilesOpen +argKeepInlineImages argLinearize argLinearizePass argMinVersion @@ -124,10 +130,12 @@ argOiMinArea argOiMinHeight argOiMinWidth argOptimizeImages +argOverlay argPages ArgParser argPassword argPasswordIsHexKey +argPasswordMode argPositional argPreserveUnreferenced argPreserveUnreferencedResources @@ -147,7 +155,14 @@ argSplitPages argStaticAesIv argStaticId argStreamData +argSuppressPasswordRecovery argSuppressRecovery +argUnderlay +argUOfrom +argUOpassword +argUOpositional +argUOrepeat +argUOto argv argVerbose argVersion @@ -188,7 +203,9 @@ atoi auth AuthEvent autobuilder +autobuilders autoconf +autofiles autogen autoheader autolabel @@ -217,6 +234,7 @@ beb Berkenbilt betweenTokens bf +bi bidirectionally binmode bis @@ -233,6 +251,7 @@ bookinfo bool BORLANDC bp +BPC bpp bpr brdp @@ -268,6 +287,7 @@ cc ccase ccc CCF +CCITT CCITTFaxDecode cd cdc @@ -319,6 +339,7 @@ clearPipelineStack clearsign cleartext ClearTextMetadata +CLI ClosedFileInputSource CloseHandle closeObject @@ -347,7 +368,9 @@ config conftest const ContentNormalizer +ContentProvider contrib +convertIIDict CopiedStreamDataProvider copyEncryptionParameters copyForeign @@ -384,8 +407,10 @@ ctest ctx ctype CVE +cx cxx CXXFLAGS +cy cygwin da daae @@ -497,6 +522,7 @@ dwVolumeSerialNumber dx dy ea +eacute eadb earlychange EarlyChange @@ -512,7 +538,7 @@ eeee ef EFF efgh -EI +ei ejb elif elt @@ -521,6 +547,7 @@ embeddedFiles emc emptyPDF en +encodable encodeDataIncrementally encodeFile encodeRow @@ -568,6 +595,9 @@ exp expectInlineImage ExtensionLevel extern +externalize +externalized +externalizeInlineImages fb fBqpdf fc @@ -575,6 +605,7 @@ fcc fclose fcntl fd +fdict feebbd ferror ff @@ -602,6 +633,7 @@ filterCompressedObjects filterPageContents findAndSkipNextEOL findAttachmentStreams +findEI findEndstream findFirst findHeader @@ -626,6 +658,7 @@ flattenAnnotationsForPage flattenPagesTree flattenScalarReferences Florian +fmatrix FMT fn fname @@ -690,7 +723,9 @@ getArrayItem getArrayNItems getAsArray getAsMap +getAsMatrix getAsVector +getAttribute getBits getBitsSigned getBoolValue @@ -699,6 +734,8 @@ getChoices getCompressibleObjects getCompressibleObjGens getCount +getCropBox +getDA getDataChecksum getDefaultAppearance getDefaultValue @@ -728,6 +765,7 @@ getFlags getFontFromResource getFontName getFormFields +getFormXObjectForPage getFullyQualifiedName getGen getGeneration @@ -757,7 +795,9 @@ getLinearizationOffset getLinearizedParts getMappingName getMatch +getMatrixForTransformations getMax +getMediaBox getMessageDetail getMin getName @@ -818,6 +858,7 @@ getTitle getToken getTopLevelOutlines getTrailer +getTrimBox getTrimmedTrailer getTrimmedUserPassword getTrimmedUserPassword's @@ -827,6 +868,8 @@ getTypeName getU getUE getUncompressedObject +getUniqueId +getUniqueResourceName getUserPassword getUTF getV @@ -922,6 +965,8 @@ iff ifndef ifstream ignorable +IIm +iit ijg Im ImageC @@ -953,6 +998,7 @@ initOptionTable inline InlineImage inlineimage +InlineImageTracker ino inode inpdf @@ -1179,6 +1225,7 @@ MixColumn mk mkinstalldirs mklink +ModOther monoseq mr MSC @@ -1199,6 +1246,7 @@ nannots nbackrefs nbits nbsp +nBT nbytes nch ndash @@ -1212,6 +1260,7 @@ nET newArray newBool NewDict +newdict newDictionary newFromMatrix newFromRectangle @@ -1259,6 +1308,7 @@ npos nproc nq nQ +nr nrounds nshared nspaces @@ -1288,6 +1338,7 @@ ObjectHolder objectStreamsChoices objectWarning ObjGen +objgen ObjGens objGenToIndirect objid @@ -1300,6 +1351,7 @@ ObjUser objusers oc odh +odict oe OffsetInputSource og @@ -1313,6 +1365,7 @@ olist omap ooh op +opages OpenAction openObject opensource @@ -1323,6 +1376,7 @@ org orig orred os +OSS ostream ostringstream ot @@ -1346,12 +1400,14 @@ pacman padLen Paeth PaethPredictor +pagefile PageLabel PageLabels pagelabels pagemode PageMode pageno +pagenos pageobj pagepos pageposfrom @@ -1369,6 +1425,7 @@ parsePageContents parsePagesOptions ParserCallbacks parseRotationParameter +parseUnderOverlayOptions parseVersion partialname partLen @@ -1385,6 +1442,8 @@ pcre pdf PDFâ PDFContext +pdfdoc +PDFDoc PDFDocEncoding pdfDumpInfoDict PDFs @@ -1409,9 +1468,11 @@ Pkey pkg PKI pl +placeFormXObject plaintext plb pldh +pm png PNGFilter pngify @@ -1419,10 +1480,12 @@ PointerHolder PointerHolder's popPipelineStack poppler +popup pornin pos POSIX PP +PPA pr pragma pre @@ -1454,9 +1517,11 @@ prov provideRandomData provideStreamData proxied +ps PSâ pseudorandom pt +ptemp pthread ptr pushDiscardFilter @@ -1518,8 +1583,10 @@ QPDFSystemError QPDFTokenizer QPDFTYPES QPDFVersion +QPDFWordTokenFinder QPDFWriter QPDFXRefEntry +qpf qqqcqqq qstream QStream @@ -1561,6 +1628,7 @@ readObject readObjectAtOffset readObjectInternal readToken +realmain reattached recompress recompressed @@ -1645,9 +1713,11 @@ sAlT saphir sarray SASLprep +savable scanline scanlines sch +sdk sdp se SecureRandomDataProvider @@ -1677,6 +1747,7 @@ setFile setFilename setFromVector setIgnoreXRefStreams +setImmediateCopyFrom setItem setIV setjmp @@ -1724,6 +1795,7 @@ sev sf sha shallowCopy +shallowCopyPage showLinearizationData showXRefTable sizeof @@ -1743,6 +1815,9 @@ srandom src srdp sstream +stampfile +stamppdf +StandardEncoding startoffset startxref stat @@ -1830,11 +1905,14 @@ TfFinder tfh tgen th +thax thomas tiffcmp TIFFPredictor Tj -TM +TL +Tm +tmatrix tmp tnum Tobias @@ -1851,12 +1929,15 @@ tokenizer tokenizing tokenTypeName toolchain -Toolchains +toolchains toupper toUTF tp transcode +transcoders +transcodes transcoding +transformRectangle traverseField travis TrimBox @@ -1869,6 +1950,7 @@ Tval tx txt ty +typename typeWarning ubuntu uc @@ -1886,7 +1968,11 @@ ULONGLONG uncompresesd uncompress uncompressing +unconflicting undef +underlaid +underlaying +UnderOverlay understandDecodeParams unencrypted unfilterable @@ -1906,6 +1992,8 @@ unreadCh unreferenced unresolvable unretrieved +uo +upages upass updateAllPagesCache updateMap @@ -1919,6 +2007,7 @@ ury usageExit UseAes UseOutlines +UserUnit useStaticIV useZeroIV USLetter @@ -1926,6 +2015,7 @@ usr utf Util utils +uuid uval val valgrind @@ -1950,7 +2040,9 @@ vp vvv warnIfPossible wb +wchar Wconversion +wcslen Weimer werror WFLAGS @@ -1960,6 +2052,8 @@ winansi WinAnsiEncoding wincrypt WindowsCryptProvider +wmain +wmatrix Wold wrapInArray writeAppearance @@ -1995,6 +2089,7 @@ xA xa xABUL xb +xbd xbebfbc xbf xc @@ -2006,6 +2101,7 @@ xDC xe xeaa xee +xef xefcdab xF xf @@ -2040,18 +2136,21 @@ xrefFirst XRefStm xrefStream xrefTable +xscale xsl XSLTPROC XXX xy yn yp +yscale yuiop yyyymmdd z's zalloc zarko Zarko's +zcaron zdata Zeroize zeroizing diff --git a/libqpdf/QPDFPageObjectHelper.cc b/libqpdf/QPDFPageObjectHelper.cc index e72b4c70..9543d294 100644 --- a/libqpdf/QPDFPageObjectHelper.cc +++ b/libqpdf/QPDFPageObjectHelper.cc @@ -553,7 +553,7 @@ QPDFPageObjectHelper::shallowCopyPage() { throw std::runtime_error( "QPDFPageObjectHelper::shallowCopyPage" - " called with a direct objet"); + " called with a direct object"); } QPDFObjectHandle new_page = this->oh.shallowCopy(); return QPDFPageObjectHelper(qpdf->makeIndirectObject(new_page)); @@ -623,7 +623,7 @@ QPDFPageObjectHelper::getFormXObjectForPage(bool handle_transformations) { throw std::runtime_error( "QPDFPageObjectHelper::getFormXObjectForPage" - " called with a direct objet"); + " called with a direct object"); } QPDFObjectHandle result = QPDFObjectHandle::newStream(qpdf); QPDFObjectHandle newdict = result.getDict(); @@ -690,7 +690,7 @@ QPDFPageObjectHelper::placeFormXObject( if (invert_transformations) { // tmatrix inverts scaling and rotation of the destination - // page. Applying this matrix allows the overlayed form + // page. Applying this matrix allows the overlaid form // XObject's to be absolute rather than relative to properties // of the destination page. tmatrix is part of the computed // transformation matrix. @@ -713,7 +713,7 @@ QPDFPageObjectHelper::placeFormXObject( // to adjust this for scale and position. // Step 1: figure out what scale factor we need to make the form - // XObject's bnounding box fit within the destination rectangle. + // XObject's bounding box fit within the destination rectangle. // Transform bounding box QPDFObjectHandle::Rectangle bbox = bbox_obj.getArrayAsRectangle(); diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml index 1b4dd31b..8333dd25 100644 --- a/manual/qpdf-manual.xml +++ b/manual/qpdf-manual.xml @@ -266,7 +266,7 @@ make prevent you from accidentally forgetting to regenerate automatic files after modifying their sources. If your packaging environment automatically refreshes automatic files, - it can cause this check to fail. Supress qpdf's checks by + it can cause this check to fail. Suppress qpdf's checks by passing <option>--disable-check-autofiles</option> to <command>/.configure</command>. This is safe since qpdf's <command>autogen.sh</command> just runs autotools in the normal @@ -1259,7 +1259,7 @@ outfile.pdf</option> output. The <option>--overlay</option> and <option>--underlay</option> options work the same way, except underlay pages are drawn underneath the page to which they are - applied, possibly obscured by the origial page, and overlay files + applied, possibly obscured by the original page, and overlay files are drawn on top of the page to which they are applied, possibly obscuring the page. You can combine overlay and underlay. </para> @@ -4331,7 +4331,7 @@ print "\n"; correctly receive them. In the past, they would have either been encoded as Windows code page 1252 (also known as “Windows ANSI” or as something - unintelligble. In almost all cases, qpdf is able to + unintelligible. In almost all cases, qpdf is able to properly interpret Unicode arguments now, whereas in the past, it would almost never interpret them properly. The result is that non-ASCII passwords given to the qpdf CLI @@ -4425,7 +4425,7 @@ print "\n"; encryption options <option>--assemble</option>, <option>--annotate</option>, <option>--form</option>, and <option>--modify-other</option> allow more fine-grained - granluarity in configuring options. Before, the + granularity in configuring options. Before, the <option>--modify</option> option only configured certain predefined groups of permissions. </para> @@ -4573,7 +4573,7 @@ print "\n"; Add method <function>QPDFPageObjectHelper::getAttribute</function> for retrieving an attribute from the page dictionary taking - inheritence into consideration, and optionally making a copy + inheritance into consideration, and optionally making a copy if your intention is to modify the attribute. </para> </listitem> diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc index 6db07432..17484b3f 100644 --- a/qpdf/qpdf.cc +++ b/qpdf/qpdf.cc @@ -1194,7 +1194,7 @@ ArgParser::argHelp() << "cases, but you can fine-tune with this option.\n" << "\n" << " bytes: use the password literally as supplied\n" - << " hex-bytes: interpret the password as ahex-encoded byte string\n" + << " hex-bytes: interpret the password as a hex-encoded byte string\n" << " unicode: interpret the password as a UTF-8 encoded string\n" << " auto: attempt to infer the encoding and adjust as needed\n" << "\n" @@ -1258,7 +1258,7 @@ ArgParser::argHelp() << "\n" << "These options allow pages from another file to be overlaid or underlaid\n" << "on the primary output. Overlaid pages are drawn on top of the destination\n" - << "page and may obsecure the page. Underlaid pages are drawn below the\n" + << "page and may obscure the page. Underlaid pages are drawn below the\n" << "destination page.\n" << "\n" << "{--overlay | --underlay } file\n" diff --git a/qpdf/test_driver.cc b/qpdf/test_driver.cc index 743a0082..e83f84aa 100644 --- a/qpdf/test_driver.cc +++ b/qpdf/test_driver.cc @@ -1985,9 +1985,9 @@ void runtest(int n, char const* filename1, char const* arg2) // red pages are from pdf, blue pages are from pdf2 // red pages always have stated rotation absolutely - // 56: blue pages are overlayed exactly on top of red pages + // 56: blue pages are overlaid exactly on top of red pages // 57: blue pages have stated rotation relative to red pages - // 58: blue pages have no rotation (absolutely upgright) + // 58: blue pages have no rotation (absolutely upright) // 59: blue pages have stated rotation absolutely bool handle_from_transformation = ((n == 57) || (n == 59)); bool invert_to_transformation = ((n == 58) || (n == 59)); |