prepare for release

staD020 · Jul 13, 2024 · 7bd80dd · 7bd80dd
1 parent d388e04
commit 7bd80dd
Show file tree

Hide file tree

Showing 19 changed files with 13 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -78,6 +78,7 @@ dist: $(ALLTARGETS) $(TARGET) readme $(TESTSID) $(TESTSID2) $(TESTSIDMAD) $(TEST
 	cp testdata/dragonslair320x200.png dist/testdata/
 	cp testdata/sir_scorpion320x200.png dist/testdata/
 	cp testdata/joe_hatching320x200.png dist/testdata/
+	cp testdata/the_sarge_1337*.gif dist/testdata/
 	./$(TARGET) -d -q -bf -nbc -o dist/01.floris.prg testdata/floris_untitled.png
 	./$(TARGET) -d -q -bf -o dist/02.mermaid.prg testdata/mermaid_song_of_the_sunset.png
 	./$(TARGET) -d -q -bf -o dist/03.shortcircuit.prg testdata/short_circuit.png
@@ -98,8 +99,11 @@ dist: $(ALLTARGETS) $(TARGET) readme $(TESTSID) $(TESTSID2) $(TESTSIDMAD) $(TEST
 	./$(TARGET) -d -q -bf -nbc -o dist/18.scorpion.prg testdata/sir_scorpion320x200.png
 	./$(TARGET) -d -q -bf -o dist/19.joe.prg testdata/joe_hatching320x200.png
 	./$(TARGET) -d -q -o dist/phatchar.prg testdata/charanim/phatchar*.png
+	./$(TARGET) -d -q -bf -o "dist/1337 1.prg" testdata/the_sarge_1337_1.gif
+	./$(TARGET) -d -q -bf -o "dist/1337 2.prg" testdata/the_sarge_1337_2.gif
+	./$(TARGET) -d -q -bf -o "dist/1337 3.prg" testdata/the_sarge_1337_3.gif
 	rm -f dist/examples.d64
-	d64 -add dist/examples.d64 dist/0?.*.prg dist/1?.*.prg dist/phatchar.prg
+	d64 -add dist/examples.d64 dist/0?.*.prg dist/1?.*.prg dist/phatchar.prg dist/1337*.prg
 	rm -f dist/*.prg
 
 .PHONY: dist readme

diff --git a/display_ecm_charset.prg b/display_ecm_charset.prg
diff --git a/display_hires.prg b/display_hires.prg
diff --git a/display_hires_anim.prg b/display_hires_anim.prg
diff --git a/display_koala.prg b/display_koala.prg
diff --git a/display_koala_anim.prg b/display_koala_anim.prg
diff --git a/display_koala_anim_alternative.prg b/display_koala_anim_alternative.prg
diff --git a/display_mc_charset.prg b/display_mc_charset.prg
diff --git a/display_mc_charset_anim.prg b/display_mc_charset_anim.prg
diff --git a/display_mc_sprites.prg b/display_mc_sprites.prg
diff --git a/display_mci_bitmap.prg b/display_mci_bitmap.prg
diff --git a/display_mixed_charset.prg b/display_mixed_charset.prg
diff --git a/display_petscii_charset.prg b/display_petscii_charset.prg
diff --git a/display_sc_charset.prg b/display_sc_charset.prg
diff --git a/display_sc_sprites.prg b/display_sc_sprites.prg
diff --git a/doc.go b/doc.go
@@ -29,7 +29,7 @@ func PrintHelp() {
 	fmt.Println("## What is new")
 	fmt.Println()
 	fmt.Println("Png2prg 1.8 introduces multiple image optimization techniques to improve")
-	fmt.Println("pack ratio of output images.")
+	fmt.Println("the pack ratio of output images.")
 	fmt.Println("See 'Brute Force Mode and Pack Optimization' below.")
 	fmt.Println()
 	fmt.Println("Multicolor charsets of multiple frames is now supported.")
@@ -285,7 +285,7 @@ func PrintHelp() {
 	fmt.Println("    |    7332 |   7372 |     7332 |       7324 |   7546 | Untitled/Floris")
 	fmt.Println("    |    5136 |   5190 |     5149 |         bf |   5464 | Song of the Sunset/Mermaid")
 	fmt.Println("    |    5968 |   5998 |     5963 |         bf |   6155 | Short Circuit/Karen Davies")
-	fmt.Println("    |    3618 |   3647 |     3616 |       3589 |   3830 | Portait L+D/Sander")
+	fmt.Println("    |    3618 |   3647 |     3616 |       3589 |   3830 | Portrait L+D/Sander")
 	fmt.Println("    |    5094 |   5080 |     5083 |       5078 |   5320 | Weee/Mermaid")
 	fmt.Println("    |    7497 |   7471 |     7458 |         bf |   7612 | Deadlock/Robin Levy")
 	fmt.Println("    |    8068 |   8097 |     8046 |       8038 |   8227 | Room with a view/Veto")

diff --git a/lib.asm b/lib.asm
@@ -1,7 +1,7 @@
 .importonce
 
 .function versionString() {
-	.return "1.7"
+	.return "1.8"
 }
 
 .function year() {

diff --git a/png2prg.go b/png2prg.go
@@ -25,7 +25,7 @@ import (
 )
 
 const (
-	Version              = "1.7.7-dev"
+	Version              = "1.8"
 	displayerJumpTo      = "$0822"
 	MaxColors            = 16
 	MaxChars             = 256

diff --git a/readme.md b/readme.md
@@ -1,4 +1,4 @@
-# PNG2PRG 1.7.7-dev by burg
+# PNG2PRG 1.8 by burg
 
 Png2prg converts a 320x200 image (png/gif/jpeg) to a c64 hires or
 multicolor bitmap, charset, petscii, ecm or sprites prg. It will find the best
@@ -17,7 +17,7 @@ This tool can be used in all buildchains on all common platforms.
 ## What is new
 
 Png2prg 1.8 introduces multiple image optimization techniques to improve
-pack ratio of output images.
+the pack ratio of output images.
 See 'Brute Force Mode and Pack Optimization' below.
 
 Multicolor charsets of multiple frames is now supported.
@@ -273,7 +273,7 @@ All koalas are packed with [Dali 0.3.2](https://csdb.dk/release/?id=223584).
     |    7332 |   7372 |     7332 |       7324 |   7546 | Untitled/Floris
     |    5136 |   5190 |     5149 |         bf |   5464 | Song of the Sunset/Mermaid
     |    5968 |   5998 |     5963 |         bf |   6155 | Short Circuit/Karen Davies
-    |    3618 |   3647 |     3616 |       3589 |   3830 | Portait L+D/Sander
+    |    3618 |   3647 |     3616 |       3589 |   3830 | Portrait L+D/Sander
     |    5094 |   5080 |     5083 |       5078 |   5320 | Weee/Mermaid
     |    7497 |   7471 |     7458 |         bf |   7612 | Deadlock/Robin Levy
     |    8068 |   8097 |     8046 |       8038 |   8227 | Room with a view/Veto
@@ -361,7 +361,7 @@ func convertPNG(w io.Writer, png io.Reader) (int64, error) {
 }
 ```
 
-## Changes for version 1.7.7-dev
+## Changes for version 1.8
 
  - Improve crunchiness by re-using the previous char's bitpair-colors.
  - Add -no-prev-char-colors flag to disable re-use of the previous char's