Fix #157, bump version

Author: hhrutter

.gitignore

@@ -15,5 +15,11 @@ _scripts/*.csv
 dist/*
 
 # Samples generated by tests
-pkg/samples/**
+# pkg/samples/create/*
+# pkg/samples/fonts/*
+# pkg/samples/grid/*
+# pkg/samples/import/*
+# pkg/samples/nup/*
+# pkg/samples/stamp/*
+# pkg/samples/watermark/*
 

.goreleaser.yml

@@ -13,12 +13,18 @@ builds:
     - amd64
 dist: ./dist
 archives:
-- replacements:
-    darwin: Darwin
-    linux: Linux
-    windows: Windows
-    386: i386
-    amd64: x86_64
+  -
+    format: tar.xz
+    format_overrides:
+      - goos: windows
+        format: zip
+    replacements:
+      darwin: macOS
+      linux: Linux
+      windows: Windows
+      386: i386
+      amd64: x86_64
+    wrap_in_directory: true
 checksum:
   name_template: 'checksums.txt'
 snapshot:

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - 1.13.x
+  - 1.14.x
 
 os:
   - linux

README.md

@@ -58,29 +58,29 @@ func TestImportImages(t *testing.T) {
 		impConf       string
 		ensureOutFile bool
 	}{
-		// Convert an image into a single page PDF.
-		// The page dimensions will match the image dimensions.
+		//Convert an image into a single page PDF.
+		//The page dimensions will match the image dimensions.
 		{"TestConvertImageToPDF",
 			[]string{filepath.Join(resDir, "logoSmall.png")},
 			"convertImage.pdf",
 			"",
 			false},
 
 		// Import an image as a new page of the existing output file.
-		{"TestImportImage",
-			[]string{filepath.Join(resDir, "logoSmall.png")},
-			"importImage.pdf",
-			"",
-			true},
+		// {"TestImportImage",
+		// 	[]string{filepath.Join(resDir, "logoSmall.png")},
+		// 	"importImage.pdf",
+		// 	"",
+		// 	true},
 
-		// Import images by creating an A3 page for each image.
-		// Images are page centered with 1.0 relative scaling.
-		// Import an image as a new page of the existing output file.
+		//Import images by creating an A3 page for each image.
+		//Images are page centered with 1.0 relative scaling.
+		//Import an image as a new page of the existing output file.
 		{"TestCenteredImportImage",
 			imageFileNames(t, "../../../resources"),
-			"importImage.pdf",
+			"importImageToA3.pdf",
 			"f:A3, pos:c, s:1.0",
-			true},
+			false},
 	} {
 		testImportImages(t, tt.msg, tt.imgFiles, tt.outFile, tt.impConf, tt.ensureOutFile)
 	}

pkg/api/test/import_test.go

@@ -60,7 +60,7 @@ func imageFileNames(t *testing.T, dir string) []string {
 	}
 	fn := []string{}
 	for _, fi := range files {
-		if strings.HasSuffix(fi.Name(), "jpg") || strings.HasSuffix(fi.Name(), "png") {
+		if strings.HasSuffix(fi.Name(), "png") || strings.HasSuffix(fi.Name(), "jpg") {
 			fn = append(fn, filepath.Join(dir, fi.Name()))
 		}
 	}

pkg/api/test/nup_test.go

@@ -62,18 +62,18 @@ func (ctx *Context) ResetWriteContext() {
 	ctx.Write = NewWriteContext(ctx.Write.Eol)
 }
 
-func (rCtx *ReadContext) logReadContext(logStr []string) {
-	if rCtx.UsingObjectStreams {
-		logStr = append(logStr, "using object streams\n")
+func (rc *ReadContext) logReadContext(logStr *[]string) {
+	if rc.UsingObjectStreams {
+		*logStr = append(*logStr, "using object streams\n")
 	}
-	if rCtx.UsingXRefStreams {
-		logStr = append(logStr, "using xref streams\n")
+	if rc.UsingXRefStreams {
+		*logStr = append(*logStr, "using xref streams\n")
 	}
-	if rCtx.Linearized {
-		logStr = append(logStr, "is linearized file\n")
+	if rc.Linearized {
+		*logStr = append(*logStr, "is linearized file\n")
 	}
-	if rCtx.Hybrid {
-		logStr = append(logStr, "is hybrid reference file\n")
+	if rc.Hybrid {
+		*logStr = append(*logStr, "is hybrid reference file\n")
 	}
 }
 
@@ -90,7 +90,7 @@ func (ctx *Context) String() string {
 
 	logStr = append(logStr, fmt.Sprintf("has %d pages\n", ctx.PageCount))
 
-	ctx.Read.logReadContext(logStr)
+	ctx.Read.logReadContext(&logStr)
 
 	if ctx.Tagged {
 		logStr = append(logStr, "is tagged file\n")

pkg/pdfcpu/context.go

@@ -8,23 +8,23 @@ The commands are:
 	attachments	list, add, remove, extract embedded file attachments
 	changeopw	change owner password
 	changeupw	change user password
-	collect     create custom sequence of selected pages
+	collect		create custom sequence of selected pages
 	decrypt		remove password protection
 	encrypt		set password protection
 	extract		extract images, fonts, content, pages or metadata
 	fonts		install, list supported fonts
 	grid		rearrange pages or images for enhanced browsing experience
 	import		import/convert images to PDF
 	info		print file info
-	keywords    list, add, remove keywords
+	keywords	list, add, remove keywords
 	merge		concatenate PDFs
 	nup			rearrange pages or images for reduced number of pages
 	optimize	optimize PDF by getting rid of redundant page resources
 	pages		insert, remove selected pages
 	paper		print list of supported paper sizes
 	permissions	list, set user access permissions
 	portfolio	list, add, remove, extract portfolio entries with optional description
-	properties  list, add, remove document properties
+	properties	list, add, remove document properties
 	rotate		rotate pages
 	split		split up s PDF by span or bookmark
 	stamp		add, remove, update text, image or PDF stamps for selected pages

pkg/pdfcpu/doc.go

@@ -41,34 +41,20 @@ func IsStringUTF16BE(s string) bool {
 }
 
 // IsUTF16BE checks for Big Endian byte order mark.
-func IsUTF16BE(b []byte) (ok bool, err error) {
-
+func IsUTF16BE(b []byte) bool {
 	if len(b) == 0 {
-		return false, nil
-	}
-
-	if len(b)%2 != 0 {
-		return false, errors.Errorf("DecodeUTF16String: UTF16 needs even number of bytes: %v\n", b)
+		return false
 	}
-
 	// Check BOM
-	ok = b[0] == 0xFE && b[1] == 0xFF
-
-	return ok, nil
+	return b[0] == 0xFE && b[1] == 0xFF
 }
 
 func decodeUTF16String(b []byte) (s string, err error) {
 
 	//log.Debug.Printf("decodeUTF16String: begin %v\n", b)
 
-	// Check for Big Endian UTF-16.
-	isUTF16BE, err := IsUTF16BE(b)
-	if err != nil {
-		return
-	}
-
 	// We only accept big endian byte order.
-	if !isUTF16BE {
+	if !IsUTF16BE(b) {
 		err = errors.Errorf("decodeUTF16String: not UTF16BE: %v\n", b)
 		return
 	}
@@ -170,12 +156,7 @@ func HexLiteralToString(hexString string) (string, error) {
 	}
 
 	// Check for Big Endian UTF-16.
-	isUTF16BE, err := IsUTF16BE(b)
-	//if err != nil {
-	//	return "", err
-	//}
-
-	if isUTF16BE {
+	if IsUTF16BE(b) {
 		return decodeUTF16String(b)
 	}
 

pkg/pdfcpu/utf16.go

@@ -996,7 +996,11 @@ func validateString(xRefTable *pdf.XRefTable, o pdf.Object, validate func(string
 		s, err = pdf.HexLiteralToString(o.Value())
 
 	default:
-		return "", errors.New("pdfcpu: validateString: invalid type")
+		err = errors.New("pdfcpu: validateString: invalid type")
+	}
+
+	if err != nil {
+		return s, err
 	}
 
 	// Validation
@@ -1047,7 +1051,11 @@ func validateStringEntry(xRefTable *pdf.XRefTable, d pdf.Dict, dictName, entryNa
 		s, err = pdf.HexLiteralToString(o.Value())
 
 	default:
-		return nil, errors.Errorf("pdfcpu: validateStringEntry: dict=%s entry=%s invalid type", dictName, entryName)
+		err = errors.Errorf("pdfcpu: validateStringEntry: dict=%s entry=%s invalid type", dictName, entryName)
+	}
+
+	if err != nil {
+		return nil, err
 	}
 
 	// Validation

pkg/pdfcpu/validate/objects.go

@@ -23,7 +23,7 @@ import (
 )
 
 // VersionStr is the current pdfcpu version.
-var VersionStr = "v0.3.2 dev"
+var VersionStr = "v0.3.3 dev"
 
 // Version is a type for the internal representation of PDF versions.
 type Version int