Merge remote-tracking branch 'origin/release/4.0.2' into main

Author: jechols

Makefile

@@ -60,13 +60,13 @@ distclean: clean
 docker: | force-getbuild generate
 	docker pull golang:1
 	docker pull golang:1-alpine
-	docker build --rm --target build -f $(MakefileDir)/docker/Dockerfile -t uolibraries/rais:build $(MakefileDir)
+	docker build --rm --target build -f $(MakefileDir)/docker/Dockerfile -t rais:build $(MakefileDir)
 	docker build --rm -f $(MakefileDir)/docker/Dockerfile -t uolibraries/rais:dev $(MakefileDir)
 	make docker-alpine
 
 # Build just the alpine image for cases where we want to get this updated / cranked out fast
 docker-alpine: | force-getbuild generate
-	docker build --rm --target build -f $(MakefileDir)/docker/Dockerfile-alpine -t uolibraries/rais:build-alpine $(MakefileDir)
+	docker build --rm --target build -f $(MakefileDir)/docker/Dockerfile-alpine -t rais:build-alpine $(MakefileDir)
 	docker build --rm -f $(MakefileDir)/docker/Dockerfile-alpine -t uolibraries/rais:dev-alpine $(MakefileDir)
 
 # Build plugins on any change to their directory or their go files

docker/hub.md

@@ -1,9 +1,9 @@
 # Supported tags and respective `Dockerfile` links
 
 - [`4`, `4.0`, `4.0.1`, `latest` (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v4.0.1/docker/Dockerfile)
-- [`4-alpine`, `4.0-alpine`, `4.0.1-alpine`, `alpine` (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v4.0.1/docker/Dockerfile-alpine)
-- [`3`, `3.3`, `3.3.1` (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v3.3.1/docker/Dockerfile)
-- [`3-alpine`, `3.3-alpine`, `3.3.1-alpine` (*docker/Dockerfile-alpine*)](https://github.com/uoregon-libraries/rais-image-server/blob/v3.3.1/docker/Dockerfile-alpine)
+- [`4-alpine`, `4.0-alpine`, `4.0.1-alpine`, `alpine` (*docker/Dockerfile-alpine*)](https://github.com/uoregon-libraries/rais-image-server/blob/v4.0.1/docker/Dockerfile-alpine)
+- [`3`, `3.3`, `3.3.2`, (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v3.3.2/docker/Dockerfile)
+- [`3-alpine`, `3.3-alpine`, `3.3.2-alpine` (*docker/Dockerfile*)](https://github.com/uoregon-libraries/rais-image-server/blob/v3.3.2/docker/Dockerfile-alpine)
 
 # RAIS
 

scripts/deploy.sh

@@ -26,8 +26,7 @@ if [ ! -f /etc/rais.toml ]; then
 fi
 
 sudo cp bin/rais-server /usr/local/rais/rais-server
-sudo rm /usr/local/rais/plugins/*
-sudo cp bin/plugins/s3-images.so /usr/local/rais/plugins/
+sudo rm -f /usr/local/rais/plugins/*
 sudo cp bin/plugins/datadog.so /usr/local/rais/plugins/
 sudo cp bin/plugins/json-tracer.so /usr/local/rais/plugins/
 sudo systemctl daemon-reload

src/cmd/rais-server/image_handler.go

@@ -434,8 +434,8 @@ func (ih *ImageHandler) buildInfo(id iiif.ID, i ImageInfo) *iiif.Info {
 		info.Profile.MaxHeight = ih.Maximums.Height
 	}
 
-	// Set up tile sizes
-	if i.TileWidth > 0 {
+	// Compute scaling and tiling
+	if i.TileWidth > 0 && i.TileWidth < i.Width && i.TileHeight < i.Height {
 		var sf []int
 		scale := 1
 		for x := 0; x < i.Levels; x++ {
@@ -450,6 +450,7 @@ func (ih *ImageHandler) buildInfo(id iiif.ID, i ImageInfo) *iiif.Info {
 			sf = append(sf, scale)
 			scale <<= 1
 		}
+
 		info.Tiles = make([]iiif.TileSize, 1)
 		info.Tiles[0] = iiif.TileSize{
 			Width:        i.TileWidth,

src/cmd/rais-server/image_handler_test.go

@@ -114,10 +114,7 @@ func TestInfoHandlerBuiltJSON(t *testing.T) {
 	assert.Equal("http://iiif.io/api/image/2/level1.json", data.Profile.ConformanceURL, "Proper profile string", t)
 	assert.Equal(800, data.Width, "JSON-decoded width", t)
 	assert.Equal(400, data.Height, "JSON-decoded height", t)
-	assert.Equal(800, data.Tiles[0].Width, "JSON-decoded tile width", t)
-	assert.Equal(400, data.Tiles[0].Height, "JSON-decoded tile height", t)
-	assert.Equal(1, len(data.Tiles[0].ScaleFactors), "1 scale factor exists", t)
-	assert.Equal(1, data.Tiles[0].ScaleFactors[0], "Scale factor is 1", t)
+	assert.Equal(0, len(data.Tiles), "Tiles aren't reported when full image is a single tile", t)
 	assert.Equal("http://example.com/foo/bar/docker%2Fimages%2Ftestfile%2Ftest-world-link.jp2", data.ID, "JSON-decoded ID", t)
 	assert.Equal(1, len(w.Headers["Content-Type"]), "Proper content type length", t)
 	assert.Equal("application/json", w.Headers["Content-Type"][0], "Proper content type", t)

src/openjpeg/image_stream.go

@@ -20,8 +20,6 @@ var imageMutex sync.RWMutex
 // These are stupid, but we need to return what openjpeg considers failure
 // numbers, and Go doesn't allow a direct translation of negative values to an
 // unsigned type
-var opjZero64 C.OPJ_UINT64 = 0
-var opjMinusOne64 = opjZero64 - 1
 var opjZeroSizeT C.OPJ_SIZE_T = 0
 var opjMinusOneSizeT = opjZeroSizeT - 1
 
@@ -55,7 +53,7 @@ func opjStreamRead(writeBuffer unsafe.Pointer, numBytes C.OPJ_SIZE_T, id uint64)
 	var i, ok = lookupImage(id)
 	if !ok {
 		Logger.Errorf("Unable to find stream %d", id)
-		return opjMinusOne64
+		return opjMinusOneSizeT
 	}
 
 	var data []byte
@@ -77,7 +75,7 @@ func opjStreamRead(writeBuffer unsafe.Pointer, numBytes C.OPJ_SIZE_T, id uint64)
 		if err != io.EOF {
 			Logger.Errorf("Unable to read from stream %d: %s", id, err)
 		}
-		return opjMinusOne64
+		return opjMinusOneSizeT
 	}
 
 	return C.OPJ_SIZE_T(n)

src/version/version.go

@@ -3,4 +3,4 @@
 package version
 
 // Version tells us the app version string
-const Version = "4.0.1"
+const Version = "4.0.2"