Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<ubuntu.tag>22.04</ubuntu.tag>
<jdk.version>21.0.11+10-1~22.04.2</jdk.version>
<python3.version>3.10.6-1~22.04.1</python3.version>
<curl.version>7.81.0-1ubuntu1.24</curl.version>
<curl.version>7.81.0-1ubuntu1.25</curl.version>

<!-- Application dependencies -->
<vertx.version>3.9.16</vertx.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -490,13 +490,14 @@ private Canvas[] createCanvases(final CsvHeaders aCsvHeaders, final List<String[
final String accessURI = StringUtils.trimToNull(columns[aCsvHeaders.getContentAccessUrlIndex()]);
final Optional<String> thumbnail = CsvParser.getMetadata(columns, aCsvHeaders.getThumbnailIndex());

String resourceURI =
StringUtils.format(Constants.SAMPLE_URI_TEMPLATE, pageURI, Constants.DEFAULT_SAMPLE_SIZE);
boolean staticImage = false;
String resourceURI;
ImageResource imageResource;
ImageContent imageContent;
Canvas canvas;

resourceURI = StringUtils.format(Constants.SAMPLE_URI_TEMPLATE, pageURI, Constants.DEFAULT_SAMPLE_SIZE);

try {
final Optional<String> width = CsvParser.getMetadata(columns, aCsvHeaders.getMediaWidthIndex());
final Optional<String> height = CsvParser.getMetadata(columns, aCsvHeaders.getMediaHeightIndex());
Expand All @@ -509,9 +510,10 @@ private Canvas[] createCanvases(final CsvHeaders aCsvHeaders, final List<String[
mediaWidth = Integer.parseInt(width.get());
mediaHeight = Integer.parseInt(height.get());

imageResource = new ImageResource(accessURI);
imageResource = new ImageResource(resourceURI);
imageResource.setWidth(mediaWidth);
imageResource.setHeight(mediaHeight);
imageResource.setService(new ImageInfoService(APIComplianceLevel.TWO, pageURI));
staticImage = true;
} else {
// If we don't have both width and height in the CSV, we can also try to look it up
Expand Down
Loading