Skip to content

PelEntryTime is not bijective #32

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

Merged
mondrake merged 5 commits into from
Jan 8, 2025
Merged

PelEntryTime is not bijective #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef6aaa8
fix PelEntryTime
mondrake Jan 8, 2025
9b54617
fix contravariance
mondrake Jan 8, 2025
a075182
add test
mondrake Jan 8, 2025
3d1cba1
fix
mondrake Jan 8, 2025
f19b626
fix
mondrake Jan 8, 2025
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
26 changes: 16 additions & 10 deletions src/PelEntryTime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,15 @@ public function getValue(int $type = self::UNIX_TIMESTAMP): string
public function setValue(mixed $timestamp, int $type = self::UNIX_TIMESTAMP): void
{
if ($type === self::UNIX_TIMESTAMP) {
if (is_int($timestamp) || is_float($timestamp)) {
$this->day_count = (int) $this->convertUnixToJd($timestamp);
$this->seconds = $timestamp % 86400;
} else {
throw new PelInvalidArgumentException('Expected integer value for $type, got %s', gettype($timestamp));
if (is_string($timestamp)) {
if (is_numeric($timestamp)) {
$timestamp = (int) $timestamp;
} else {
throw new PelInvalidArgumentException('Expected numeric value for $type, got "%s"', $timestamp);
}
}
$this->day_count = (int) $this->convertUnixToJd($timestamp);
$this->seconds = $timestamp % 86400;
} elseif ($type === self::EXIF_STRING) {
/*
* Clean the timestamp: some timestamps are broken other
Expand All @@ -179,12 +182,15 @@ public function setValue(mixed $timestamp, int $type = self::UNIX_TIMESTAMP): vo
$this->day_count = $this->convertGregorianToJd((int) $d[0], (int) $d[1], (int) $d[2]);
$this->seconds = (int) $d[3] * 3600 + (int) $d[4] * 60 + (int) $d[5];
} elseif ($type === self::JULIAN_DAY_COUNT) {
if (is_int($timestamp) || is_float($timestamp)) {
$this->day_count = (int) floor($timestamp);
$this->seconds = (int) (86400 * ($timestamp - floor($timestamp)));
} else {
throw new PelInvalidArgumentException('Expected integer value for $type, got %s', gettype($timestamp));
if (is_string($timestamp)) {
if (is_numeric($timestamp)) {
$timestamp = (int) $timestamp;
} else {
throw new PelInvalidArgumentException('Expected numeric value for $type, got "%s"', $timestamp);
}
}
$this->day_count = (int) floor($timestamp);
$this->seconds = (int) (86400 * ($timestamp - floor($timestamp)));
} else {
throw new PelInvalidArgumentException('Expected UNIX_TIMESTAMP (%d), EXIF_STRING (%d), or JULIAN_DAY_COUNT (%d) for $type, got %d.', self::UNIX_TIMESTAMP, self::EXIF_STRING, self::JULIAN_DAY_COUNT, $type);
}
Expand Down
32 changes: 32 additions & 0 deletions test/ReadWriteTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,38 @@ public static function writeEntryProvider(): \Iterator
];
}

/**
* Tests loading and writing back a JPEG image file.
*/
public function testJpegLoadSave(): void
{
$file_uri = __DIR__ . '/imagetests/canon-eos-650d.jpg';
$jpeg = new PelJpeg($file_uri);
$exif = $jpeg->getExif();
$this->assertInstanceOf(PelExif::class, $exif);
$tiff = $exif->getTiff();
$this->assertInstanceOf(PelTiff::class, $tiff);
$ifd0 = $tiff->getIfd();
$this->assertInstanceOf(PelIfd::class, $ifd0);

$entry = $ifd0->getEntry(271); // Make
$this->assertInstanceOf(PelEntryAscii::class, $entry);
$this->assertSame('Canon', $entry->getValue());
$entry->setValue('Foo-Bar');

$out_uri = __DIR__ . '/imagetests/output.canon-eos-650d.jpg';
$jpeg->saveFile($out_uri);

unset($jpeg);

$data_reload = exif_read_data($out_uri);
$this->assertIsArray($data_reload);
$this->assertArrayHasKey('Make', $data_reload);
$this->assertEquals('Foo-Bar', $data_reload['Make']);

unlink($out_uri);
}

/**
* Tests loading and writing back a TIFF image file.
*/
Expand Down
Loading