ext/exif: Minor refactoring of exif_thumbnail() #16111
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nielsdos
reviewed
Sep 28, 2024
ext/exif/exif.c
Outdated
| ZVAL_STRINGL(return_value, ImageInfo.Thumbnail.data, ImageInfo.Thumbnail.size); | ||
| if (arg_c >= 3) { | ||
| RETVAL_STRINGL(ImageInfo.Thumbnail.data, ImageInfo.Thumbnail.size); | ||
| if (z_height) { |
There was a problem hiding this comment.
Fun fact: this means that if you pass a $width argument but not the $height argument, that the $width isn't even filled in.
There was a problem hiding this comment.
Right, I hadn't even realised this.
This is pretty suboptimal :|
There was a problem hiding this comment.
Okay, made some changes so that one can just pass $width
Girgias
changed the title
Girgias
force-pushed
the
exif-argnum
branch
from
4546b87 to
2a126aa
Compare
nielsdos
requested changes
Sep 28, 2024
ext/exif/exif.c
Outdated
| } | ||
| if (z_height) { | ||
| if (!ImageInfo.Thumbnail.height) { | ||
| if (!exif_scan_thumbnail(&ImageInfo)) { |
There was a problem hiding this comment.
Now you'll be scanning twice in case of a zero height.
I also don't like the duplication.
I'd just do (untested):
if ((z_width || z_height) && (!ImageInfo.Thumbnail.width || !ImageInfo.Thumbnail.height)) {
if (!exif_scan_thumbnail(&ImageInfo)) {
ImageInfo.Thumbnail.width = ImageInfo.Thumbnail.height = 0;
}
}
ext/exif/exif.c
Outdated
| ZEND_TRY_ASSIGN_REF_LONG(z_height, ImageInfo.Thumbnail.height); | ||
| } | ||
| if (arg_c >= 4) { | ||
| if (z_imagetype) { |
nielsdos
approved these changes
Sep 29, 2024
jorgsowa
pushed a commit
to jorgsowa/php-src
that referenced
this pull request
Oct 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.