Merge pull request #2 from Ziemas/main

Fix decoding and pl2-to-png

cmd/pl2-to-png/main.go

@@ -8,6 +8,7 @@ import (
 	"image/png"
 	"io/ioutil"
 	"os"
+	"path"
 
 	"github.com/OpenDiablo2/pl2/pkg"
 )
@@ -18,7 +19,7 @@ type options struct {
 }
 
 func parseOptions(o *options) (terminate bool) {
-	o.pl2 = flag.String("pl2", "", "input pkg file (required)")
+	o.pl2 = flag.String("pl2", "", "input pl2 file (required)")
 	o.pngPath = flag.String("png", "", "path to output png file (optional)")
 
 	flag.Parse()
@@ -43,16 +44,22 @@ func main() {
 
 	pl2, err := pkg.FromBytes(data)
 	if err != nil {
+		fmt.Print(fmt.Errorf("Error decoding pl2: %w\n", err))
 		return
 	}
 
-	if *o.pngPath != "" {
-		img := makeImage(pl2)
+	pngPath := *o.pngPath
 
-		err = writeImage(*o.pngPath, img)
-		if err != nil {
-			fmt.Errorf("problem writing image, %w", err)
-		}
+	if pngPath == "" {
+		pngPath, _ = os.Getwd()
+		pngPath = path.Join(pngPath, "output.png")
+	}
+
+	img := makeImage(pl2)
+
+	err = writeImage(pngPath, img)
+	if err != nil {
+		fmt.Print(fmt.Errorf("problem writing image, %w", err))
 	}
 }
 
@@ -188,4 +195,4 @@ func writeImage(outPath string, img image.Image) error {
 	}
 
 	return nil
-}
+}

pkg/decode.go

@@ -31,9 +31,8 @@ func (pl2 *PL2) Decode(rs io.ReadSeeker) (*PL2, error) {
 	return pl2, nil
 }
 
-func (pl2 *PL2) decodeColors(stream *bitstream.Reader, dst color.Palette) error {
+func (pl2 *PL2) decodeColors(stream *bitstream.Reader, dst color.Palette, colorBytes int) error {
 	const (
-		colorBytes       = 4
 		rOff, gOff, bOff = 0, 1, 2 // rgb offsets in the returned bytes
 	)
 
@@ -55,13 +54,13 @@ func (pl2 *PL2) decodeColors(stream *bitstream.Reader, dst color.Palette) error
 func (pl2 *PL2) decodeBasePalette(stream *bitstream.Reader) error {
 	pl2.BasePalette = make(color.Palette, numPaletteColors)
 
-	return pl2.decodeColors(stream, pl2.BasePalette)
+	return pl2.decodeColors(stream, pl2.BasePalette, 4)
 }
 
 func (pl2 *PL2) decodeTextColors(stream *bitstream.Reader) error {
 	pl2.TextColors = make(color.Palette, numTextColors)
 
-	return pl2.decodeColors(stream, pl2.TextColors)
+	return pl2.decodeColors(stream, pl2.TextColors, 3)
 }
 
 func (pl2 *PL2) decodeTransforms(stream *bitstream.Reader) (err error) {