Use innolitics DICOM Standard JSON dump to generate tags.

Makefile

@@ -1,6 +1,11 @@
 BINARY = dicomutil
 VERSION = `git describe --tags --always`
 
+.PHONY: codegen
+codegen:
+	- go generate -x ./...
+	- gofmt -s -w ./pkg/tag
+
 .PHONY: build
 build:
 	go mod download

dataset.go

@@ -175,7 +175,7 @@ func (d *Dataset) String() string {
 		tabs := buildTabs(elem.l)
 		var tagName string
 		if tagInfo, err := tag.Find(elem.e.Tag); err == nil {
-			tagName = tagInfo.Name
+			tagName = tagInfo.Keyword
 		}
 
 		b.WriteString(fmt.Sprintf("%s[\n", tabs))

element.go

@@ -46,7 +46,7 @@ func (e *Element) Equals(target *Element) bool {
 func (e *Element) String() string {
 	var tagName string
 	if tagInfo, err := tag.Find(e.Tag); err == nil {
-		tagName = tagInfo.Name
+		tagName = tagInfo.Keyword
 	}
 	return fmt.Sprintf("[\n  Tag: %s\n  Tag Name: %s\n  VR: %s\n  VR Raw: %s\n  VL: %d\n  Value: %s\n]\n\n",
 		e.Tag.String(),
@@ -147,8 +147,10 @@ func NewElement(t tag.Tag, data interface{}) (*Element, error) {
 	if err != nil {
 		return nil, err
 	}
-	rawVR := tagInfo.VR
-
+	rawVR := tagInfo.VRs[0]
+	if t == tag.PixelData {
+		rawVR = "OW"
+	}
 	value, err := NewValue(data)
 	if err != nil {
 		return nil, err

parse_internal_test.go

@@ -1,7 +1,6 @@
 package dicom
 
 import (
-	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
@@ -12,7 +11,7 @@ import (
 // This test lives in parse_internal_test.go because this test cannot live in the dicom_test package, due
 // to some dependencies on internal valuesets for diffing.
 func TestParseUntilEOFConformsToParse(t *testing.T) {
-	files, err := ioutil.ReadDir("./testdata")
+	files, err := os.ReadDir("./testdata")
 	if err != nil {
 		t.Fatalf("unable to read testdata/: %v", err)
 	}

parse_test.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"image/jpeg"
-	"io/ioutil"
+	"io"
 	"os"
 	"strings"
 	"testing"
@@ -20,7 +20,7 @@ import (
 // TestParse is an end-to-end sanity check over DICOMs in testdata/. Currently,
 // it only checks that no error is returned when parsing the files.
 func TestParse(t *testing.T) {
-	files, err := ioutil.ReadDir("./testdata")
+	files, err := os.ReadDir("./testdata")
 	if err != nil {
 		t.Fatalf("unable to read testdata/: %v", err)
 	}
@@ -46,7 +46,7 @@ func TestParse(t *testing.T) {
 }
 
 func TestParseUntilEOF(t *testing.T) {
-	files, err := ioutil.ReadDir("./testdata")
+	files, err := os.ReadDir("./testdata")
 	if err != nil {
 		t.Fatalf("unable to read testdata/: %v", err)
 	}
@@ -205,7 +205,7 @@ func BenchmarkParse(b *testing.B) {
 	}
 	for _, tc := range cases {
 		b.Run(tc.name, func(b *testing.B) {
-			files, err := ioutil.ReadDir("./testdata")
+			files, err := os.ReadDir("./testdata")
 			if err != nil {
 				b.Fatalf("unable to read testdata/: %v", err)
 			}
@@ -219,7 +219,7 @@ func BenchmarkParse(b *testing.B) {
 						}
 						defer dcm.Close()
 
-						data, err := ioutil.ReadAll(dcm)
+						data, err := io.ReadAll(dcm)
 						if err != nil {
 							b.Errorf("Unable to read file into memory for benchmark: %v", err)
 						}
@@ -238,7 +238,7 @@ func BenchmarkParse(b *testing.B) {
 }
 
 func BenchmarkParser_NextAPI(b *testing.B) {
-	files, err := ioutil.ReadDir("./testdata")
+	files, err := os.ReadDir("./testdata")
 	if err != nil {
 		b.Fatalf("unable to read testdata/: %v", err)
 	}
@@ -252,7 +252,7 @@ func BenchmarkParser_NextAPI(b *testing.B) {
 				}
 				defer dcm.Close()
 
-				data, err := ioutil.ReadAll(dcm)
+				data, err := io.ReadAll(dcm)
 				if err != nil {
 					b.Errorf("Unable to read file into memory for benchmark: %v", err)
 				}
@@ -313,7 +313,7 @@ func Example_getImageFrames() {
 }
 
 func runForEveryTestFile(t *testing.T, testFunc func(t *testing.T, filename string)) {
-	files, err := ioutil.ReadDir("./testdata")
+	files, err := os.ReadDir("./testdata")
 	if err != nil {
 		t.Fatalf("unable to read testdata/: %v", err)
 	}

pkg/dicomio/reader.go

@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math"
 
 	"github.com/suyashkumar/dicom/pkg/charset"
@@ -21,7 +20,7 @@ var (
 )
 
 // LimitReadUntilEOF is a special dicomio.Reader limit indicating that there is no hard limit and the
-// Reader should read until EOF. 
+// Reader should read until EOF.
 const LimitReadUntilEOF = -9999
 
 // Reader provides common functionality for reading underlying DICOM data.
@@ -197,7 +196,7 @@ func (r *reader) Skip(n int64) error {
 		return ErrorInsufficientBytesLeft
 	}
 
-	_, err := io.CopyN(ioutil.Discard, r, n)
+	_, err := io.CopyN(io.Discard, r, n)
 
 	return err
 }