Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add geotiff images #53

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add geotiff images #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb90e8a
fix locale to en-US
don-vip Jul 29, 2024
18a725f
Add GeoTIFF data - #49
don-vip Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion src/dotnet/MetadataExtractor.MediaLibraryProcessor/Java/JavaRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static async Task RunAsync(string repoRoot)
// Output will differ across different Java runtimes.
// Output has historically been produced by:
// C:\\Program Files\\Java\\jdk1.8.0_271\\bin\\java.exe
FileName = """C:\Program Files\Java\jdk-18.0.2.1\bin\java.exe""",
FileName = "java.exe",
Arguments = string.Join(
" ",
"-classpath", $"\"{xmpCoreLibraryPath}\";{javaSrcRoot}",
Expand Down
7 changes: 7 additions & 0 deletions src/dotnet/MetadataExtractor.MediaLibraryProcessor/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,19 @@
using MetadataExtractor.MediaLibraryProcessor;

using System;
using System.Globalization;
using System.IO;
using System.Threading;

// TODO support building libraries from source too

// TODO more robust way of finding repo root path
string repoRoot = Path.GetFullPath(Path.Combine(Environment.CurrentDirectory, """..\..\..\..\..\.."""));

var culture = CultureInfo.GetCultureInfo("en-US");
Thread.CurrentThread.CurrentCulture = culture;
Thread.CurrentThread.CurrentUICulture = culture;

// Update .NET and Java metadata files
await Console.Out.WriteLineAsync("Updating metadata files...");

Expand All @@ -26,3 +32,4 @@
await DiffRunner.RunAsync(repoRoot);

await Console.Out.WriteLineAsync("Done.");

30 changes: 0 additions & 30 deletions tif/BigTIFF/metadata/diff/BigTIFF.tif.txt
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions tif/BigTIFF/metadata/diff/BigTIFFLong.tif.txt
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions tif/BigTIFF/metadata/diff/BigTIFFLong8.tif.txt
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions tif/BigTIFF/metadata/diff/BigTIFFLong8Tiles.tif.txt
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions tif/BigTIFF/metadata/diff/BigTIFFMotorola.tif.txt
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions tif/BigTIFF/metadata/diff/BigTIFFMotorolaLongStrips.tif.txt
View file
Open in desktop

This file was deleted.

31 changes: 15 additions & 16 deletions tif/BigTIFF/metadata/diff/BigTIFFSubIFD4.tif.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FILE: BigTIFFSubIFD4.tif
JAVA TYPE: UNKNOWN
DOTNET TYPE: TIFF
DOTNET
TYPE: TIFF
JAVA [ERROR: Exif IFD0] Ignored IFD marked to start outside data segment
DOTNET [Exif IFD0 - 0x0100] Image Width = 64 pixels
DOTNET [Exif IFD0 - 0x0101] Image Height = 64 pixels
DOTNET [Exif IFD0 - 0x0102] Bits Per Sample = 8 8 8 bits/component/pixel
Expand Down Expand Up @@ -39,23 +39,22 @@ DOTNET [Exif SubIFD - 0x0111] Strip Offsets = 15768
DOTNET [Exif SubIFD - 0x0115] Samples Per Pixel = 3 samples/pixel
DOTNET [Exif SubIFD - 0x0116] Rows Per Strip = 32 rows/strip
DOTNET [Exif SubIFD - 0x0117] Strip Byte Counts = 3072 bytes
DOTNET
DOTNET [File Type - 0x0001] Detected File Type Name = TIFF
DOTNET [File Type - 0x0002] Detected File Type Long Name = Tagged Image File Format
DOTNET [File Type - 0x0003] Detected MIME Type = image/tiff
DOTNET [File Type - 0x0004] Expected File Name Extension = tiff
DOTNET
DOTNET [File - 0x0001] File Name = BigTIFFSubIFD4.tif
DOTNET [File - 0x0002] File Size = 31520 bytes
DOTNET [File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>

JAVA EXCEPTION: File format could not be determined
DOTNET - Exif IFD0
[File Type - 0x0001] Detected File Type Name = TIFF
[File Type - 0x0002] Detected File Type Long Name = Tagged Image File Format
[File Type - 0x0003] Detected MIME Type = image/tiff
[File Type - 0x0004] Expected File Name Extension = tiff

[File - 0x0001] File Name = BigTIFFSubIFD4.tif
[File - 0x0002] File Size = 31520 bytes
[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>

- Exif IFD0
DOTNET - Exif SubIFD
DOTNET - Exif Thumbnail
DOTNET - Exif SubIFD
DOTNET - File Type
DOTNET - File
- File Type
- File

Generated using metadata-extractor
https://drewnoakes.com/code/exif/
Expand Down
31 changes: 15 additions & 16 deletions tif/BigTIFF/metadata/diff/BigTIFFSubIFD8.tif.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FILE: BigTIFFSubIFD8.tif
JAVA TYPE: UNKNOWN
DOTNET TYPE: TIFF
DOTNET
TYPE: TIFF
JAVA [ERROR: Exif IFD0] Ignored IFD marked to start outside data segment
DOTNET [Exif IFD0 - 0x0100] Image Width = 64 pixels
DOTNET [Exif IFD0 - 0x0101] Image Height = 64 pixels
DOTNET [Exif IFD0 - 0x0102] Bits Per Sample = 8 8 8 bits/component/pixel
Expand Down Expand Up @@ -39,23 +39,22 @@ DOTNET [Exif SubIFD - 0x0111] Strip Offsets = 15768
DOTNET [Exif SubIFD - 0x0115] Samples Per Pixel = 3 samples/pixel
DOTNET [Exif SubIFD - 0x0116] Rows Per Strip = 32 rows/strip
DOTNET [Exif SubIFD - 0x0117] Strip Byte Counts = 3072 bytes
DOTNET
DOTNET [File Type - 0x0001] Detected File Type Name = TIFF
DOTNET [File Type - 0x0002] Detected File Type Long Name = Tagged Image File Format
DOTNET [File Type - 0x0003] Detected MIME Type = image/tiff
DOTNET [File Type - 0x0004] Expected File Name Extension = tiff
DOTNET
DOTNET [File - 0x0001] File Name = BigTIFFSubIFD8.tif
DOTNET [File - 0x0002] File Size = 31520 bytes
DOTNET [File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>

JAVA EXCEPTION: File format could not be determined
DOTNET - Exif IFD0
[File Type - 0x0001] Detected File Type Name = TIFF
[File Type - 0x0002] Detected File Type Long Name = Tagged Image File Format
[File Type - 0x0003] Detected MIME Type = image/tiff
[File Type - 0x0004] Expected File Name Extension = tiff

[File - 0x0001] File Name = BigTIFFSubIFD8.tif
[File - 0x0002] File Size = 31520 bytes
[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>

- Exif IFD0
DOTNET - Exif SubIFD
DOTNET - Exif Thumbnail
DOTNET - Exif SubIFD
DOTNET - File Type
DOTNET - File
- File Type
- File

Generated using metadata-extractor
https://drewnoakes.com/code/exif/
Expand Down
24 changes: 22 additions & 2 deletions tif/BigTIFF/metadata/java/BigTIFF.tif.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,27 @@
FILE: BigTIFF.tif
TYPE: UNKNOWN
TYPE: TIFF

EXCEPTION: File format could not be determined
[Exif IFD0 - 0x0100] Image Width = 64 pixels
[Exif IFD0 - 0x0101] Image Height = 64 pixels
[Exif IFD0 - 0x0102] Bits Per Sample = 8 8 8 bits/component/pixel
[Exif IFD0 - 0x0106] Photometric Interpretation = RGB
[Exif IFD0 - 0x0111] Strip Offsets = 16
[Exif IFD0 - 0x0115] Samples Per Pixel = 3 samples/pixel
[Exif IFD0 - 0x0116] Rows Per Strip = 64 rows/strip
[Exif IFD0 - 0x0117] Strip Byte Counts = 12288 bytes

[File Type - 0x0001] Detected File Type Name = TIFF
[File Type - 0x0002] Detected File Type Long Name = Tagged Image File Format
[File Type - 0x0003] Detected MIME Type = image/tiff
[File Type - 0x0004] Expected File Name Extension = tiff

[File - 0x0001] File Name = BigTIFF.tif
[File - 0x0002] File Size = 12480 bytes
[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>

- Exif IFD0
- File Type
- File

Generated using metadata-extractor
https://drewnoakes.com/code/exif/
24 changes: 22 additions & 2 deletions tif/BigTIFF/metadata/java/BigTIFFLong.tif.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,27 @@
FILE: BigTIFFLong.tif
TYPE: UNKNOWN
TYPE: TIFF

EXCEPTION: File format could not be determined
[Exif IFD0 - 0x0100] Image Width = 64 pixels
[Exif IFD0 - 0x0101] Image Height = 64 pixels
[Exif IFD0 - 0x0102] Bits Per Sample = 8 8 8 bits/component/pixel
[Exif IFD0 - 0x0106] Photometric Interpretation = RGB
[Exif IFD0 - 0x0111] Strip Offsets = 16
[Exif IFD0 - 0x0115] Samples Per Pixel = 3 samples/pixel
[Exif IFD0 - 0x0116] Rows Per Strip = 64 rows/strip
[Exif IFD0 - 0x0117] Strip Byte Counts = 12288 bytes

[File Type - 0x0001] Detected File Type Name = TIFF
[File Type - 0x0002] Detected File Type Long Name = Tagged Image File Format
[File Type - 0x0003] Detected MIME Type = image/tiff
[File Type - 0x0004] Expected File Name Extension = tiff

[File - 0x0001] File Name = BigTIFFLong.tif
[File - 0x0002] File Size = 12480 bytes
[File - 0x0003] File Modified Date = <omitted for regression testing as checkout dependent>

- Exif IFD0
- File Type
- File

Generated using metadata-extractor
https://drewnoakes.com/code/exif/
Loading