more tests

SimonWaldherr · Oct 20, 2018 · 713b56e · 713b56e
1 parent 2eb19cc
commit 713b56e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/tests/test6.png b/tests/test6.png
diff --git a/tests/test7.png b/tests/test7.png
diff --git a/tests/tests.json b/tests/tests.json
@@ -16,7 +16,7 @@
   },
   {
     "filename": "./tests/test.png",
-    "zplstring": "^XA,^FS^FO0,0^GFA,119,51,3,00000000000000000001c00001c00001c000000000001c00001c00001c000000001ddc001ddc001ddc00000000000000000000^FS,^XZ",
+    "zplstring": "^XA,^FS^FO0,0^GFA,119,51,3,00000000000000000001C00001C00001C000000000001C00001C00001C000000001DDC001DDC001DDC00000000000000000000^FS,^XZ",
     "graphictype": "ASCII"
   },
   {
@@ -28,5 +28,15 @@
     "filename": "./tests/test5.png",
     "zplstring": "^XA,^FS^FO0,0^GFA,5602,125000,125,E38E38E38E38E38E38E38E38qL0::,::ErO0::,::ErO0::,::ErO0::,::ErO0::,::ErO0::,::ErO0::,::ErO0::,::ErO0::,::ErO0::,::ErO0::hV07F800001FE0FFgN0FFhJ07F8P0FEjR0R078hH07F800001FE0FFgN0FFhJ07F8O07FEjR0R0FChH07F800001FE0FFgN0FFP07CW0F8S07F8O0FFEjR0EP01FEhH07F800001FE0FFgN0FFP0F8V01FT07F8N01FFEjR0:EP01FEhH07F800001FE0FFgN0FFP0F8V01FT07F8N03FFEjR0Q01FEhH07F800001FE0FFgN0FFP0F8V01FT07F8N03FCjS0R0FChH07F800001FE0FFgN0FFO01FW03ET07F8N07F8jS0R078hH07F800001FE0FFgN0FFO01FW03ET07F8N07F8jS0EhU07F800001FE0FFgN0FFO01FW03ET07F8N07F8jS0EhU07F800001FE0FFgN0FFO03EW07CT07F8N07F8jS0EL01FC01FE07F0FC01F80000FE0007F0FC01FE01F80FF00FF0007F8003F1FE0FF0F800003F000FE0E1FC1C00001F8FF0003F00003E000FC7F0003F800007C3FFFFC1FC1F8007F8007E3F83FFFC03FCjN0M0FFF81FE07F3FF07FC0007FFC007F3FF01FE03F80FF0FFFE007F800FFDFE0FF3FE0001FFE00FE3E1FC7C00007FEFF001FFE0003E003FE7F001FFF00007C3FFFFC1FCFFE007F801FF3F83FFFC3FFF8jM0L01FFF01FE07F7FFCFFE000FFFE007F7FF80FE03F80FE1FFFF807F803FFFFE0FF7FF0003FFF00FE7E1FCFC0001KF003FFF0007C00FFF7F003FFF8000F83FFFFC1FDFFF007F807FFBF83FFFC7FFFEjM0L03FFF01FE07FFFFDFFF003FFFF807FFFFC0FE03FC0FE1FFFFC07F807FFFFE0KF8007FFF80FEFE1FDFC0003KF007FFF8007C01KF00FFFFE000F83FFFFC1KF807F80KF83FFFC7FFFFjM0EK07FFF01FE07NF803FFFF807FFFFE0FF03FC0FE0FFFFC07F807FFFFE0KFC00FFFFC0FFFE1FFFC0003KF00FFFFC007C01KF00FFFFE000F83FFFF81KFC07F80KF83FFFC3FFFFjM0EK07F0701FE07NF807FC7FC07FFFFE07F07FC1FC0F03FE07F80KFE0KFC01FE1FC0FFFE1FFFC0007KF01FE1FC007C03KF01FF1FF000F83FFFF81KFC07F81KF83FFFC3C0FF8jL0EK0FF0001FE07FC1FF87F80FF83FE07FC1FE07F07FC1FC0C01FE07F81FF07FE0FF83FC01F80FE0FFFE1FFFC000FF83FF01F80FE00F807FC1FF03FE0FF801F0000FF01FF83FE07F83FE0FF807F803007F8jL0L0FF0001FE07FC1FF83FC0FF01FE07FC1FF07F07FE1FC0000FE07F81FE03FE0FF83FE03F80FE0FFE01FFC0000FF01FF03F80FE00F807F81FF03FC07F801F0001FE01FF01FE07F83FC0FF807F800003F8jL0L0FF8001FE07F80FF03FC0FF01FE07F80FF07F0FBE1F80000FF07F81FE01FE0FF01FE03F007F0FF801FFK0FF00FF03F007F00F807F80FF03FC07F801F0003FC01FE01FE07F83FC07F807F800003FCjL0L0FFC001FE07F80FF03FC1FE00FF07F80FF03F8FBE3F8001FFF07F83FC01FE0FF01FE07F007F0FF801FF00001FE00FF07F007F01F007F00FF07F803FC03E0007FC01FE00FF07F83F807F807F80007FFCjL0EK07FF001FE07F80FF03FC1FE00FF07F80FF03F8FBE3F801FFFF07F83FC01FE0FF01FE07KF0FF001FE00001FE00FF07KF01F00FF00FF07F803FC03E0007F801FE00FF07F87F807F807F8007FFFCjL0EK03FFC01FE07F80FF03FC1FE00FF07F80FF03F8FBE3F007FFFF07F83FC01FE0FF01FE07KF0FF001FE00001FE00FF07KF01F00FF00FF07F803FC03E000FF001FE00FF07F87F807F807F801FFFFCjL0EK01FFF01FE07F80FF03FC1FE00FF07F80FF01F8FBF3F00KF07F83FC01FE0FF01FE07KF0FF001FE00001FE00FF07KF03F00FF00FF07F803FC07E001FF001FE00FF07F87F807F807F803FFFFCjL0M0FFF81FE07F80FF03FC1FE00FF07F80FF01F9F3F3F01KF07F83FC01FE0FF01FE07KF0FF001FE00001FE00FF07KF03E00FF00FF07F803FC07C003FE001FE00FF07F87F807F807F807FFFFCjL0M03FF81FE07F80FF03FC1FE00FF07F80FF01F9F1F3F03FE0FF07F83FC01FE0FF01FE07KF0FF001FE00001FE00FF07KF03E00FF00FF07F803FC07C003FC001FE00FF07F87F807F807F80FF83FCjL0N0FFC1FE07F80FF03FC1FE00FE07F80FF00FDF1F3E03FC0FF07F83FC01FE0FF01FE07FK0FF001FE00001FE00FF07FK03E00FF00FF07F803F807C007F8001FE00FE07F87F807F807F80FF03FCjL0EM03FC1FE07F80FF03FC0FF01FE07F80FF00FDF1F7E07F80FF07F81FE01FE0FF01FE03FK0FF001FE00F80FF00FF03FK07C007F80FF03FC07F80F800FF8001FE01FE07F83FC07F807F81FE03FCjL0EM03FC1FE07F80FF03FC0FF01FE07F80FF00FDE1FFE07F80FF07F81FE03FE0FF01FE03F80000FF001FE01FC0FF01FF03F800007C007F81FF03FC07F80F800FF0001FF01FE07F83FC0FF807F81FE03FCjL0EK0403FC1FE07F80FF03FC0FF83FC07F80FF00FFE0FFC07F81FF07F81FF07FE0FF01FE03FE0040FF001FE03FE0FF83FF03FE00407C007FC3FF03FE0FF00F801FE0001FF83FE07F83FE1FF807F81FE07FCjL0L0703F81FE07F80FF03FC07FFFFC07F80FF007FE0FFC07FC3FF07F80KFE0FF01FE01FFFFC0FF001FE03FE07KF01FFFFC0F8003KF01KF01F003FFFFC1KFC07F81KF807F81FF0FFCjL0L0FFFF81FE07F80FF03FC03FFFF807F80FF007FE0FFC03KF07F80KFE0FF01FE01FFFFC0FF001FE03FE07KF01FFFFC0F8003KF00FFFFE01F007FFFFC1KF807F81KF807F80KFCjL0L0FFFF01FE07F80FF03FC01FFFF007F80FF007FC0FF803KF07F807FFEFE0FF01FE00FFFFC0FF001FE03FE03FFF7F00FFFFC0F8001KF007FFFC01F007FFFFC1KF807F80KF807F80KFCjL0EK0FFFE01FE07F80FF03FC00FFFE007F80FF003FC07F801FFF7F07F803FFEFE0FF01FE007FFFC0FF001FE01FC01FFF7F007FFFC0F8000FFEFF003FFF801F007FFFFC1KF007F807FF7F807F807FFDFCjL0EK0FFFC01FE07F80FF03FC007FFC007F80FF003FC07F800FFE7F07F801FF8FE0FF01FE001FFFE0FF001FE01FC00FFC7F001FFFE1F00007FCFF001FFF003E007FFFFC1FEFFC007F803FE7F807F803FF9FCjL0EL0FE001FE07F80FF03FC000FE0007F80FF003F807F8001F07F07F8007E0FE0FF01FE0003FE00FF001FE0070003F07F0003FE01FK0F0FF0003F8003E007FFFFC1FE3F0007F800787F807F8007C1FCjL0kL01FM0FEN03EN01FER07FjX0kL03EL01FEN07CN01FER0FFjX0kT01FEX01FER0FFjX0kR0C03FEX01FEO0601FFjX0kQ01FFFFCX01FEO0FFFFEjX0kQ01FFFF8X01FEO0FFFFCjX0:kQ03FFFFY01FEN01FFFF8jX0kQ01FFFCY01FEO0FFFEjY0kR03FEg01FEO01FFk0,:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::rJF8K0::::::::::::::::::,:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::79E79E79E79EqX0:::79E78001E79EqX079E79E79E79EqX0:::,^FS,^XZ",
     "graphictype": "CompressedASCII"
+  },
+  {
+    "filename": "./tests/test6.png",
+    "zplstring": "^XA,^FS^FO0,0^GFA,52,51,3,FFFF00::FE3F00::FFFF00FFE300::FFFF00E22300::FFFF00::^FS,^XZ",
+    "graphictype": "CompressedASCII"
+  },
+  {
+    "filename": "./tests/test7.png",
+    "zplstring": "^XA,^FS^FO0,0^GFA,71,128,4,!::FE3KF::!FFE3FFFF::!E223FFFF::!:::FFFFC7FF::!FFFFC7C7::!FFFFC47F::!::^FS,^XZ",
+    "graphictype": "CompressedASCII"
   }
 ]
diff --git a/zplgfa.go b/zplgfa.go
@@ -89,7 +89,6 @@ func getRepeatCode(repeatCount int, char string) string {
 
 // CompressASCII compresses the ASCII data of a ZPL Graphic Field using RLE
 func CompressASCII(in string) string {
-	in = strings.ToUpper(in)
 	var curChar string
 	var lastChar string
 	var lastCharSince int
@@ -171,7 +170,9 @@ func ConvertToGraphicField(source image.Image, graphicType GraphicType) string {
 				index = 0
 			}
 		}
-		hexstr := hex.EncodeToString(line)
+
+		hexstr := strings.ToUpper(hex.EncodeToString(line))
+
 		switch graphicType {
 		case ASCII:
 			GraphicFieldData += fmt.Sprintln(hexstr)