Evolution-x/external_piex
1
0
Fork 0
mirror of https://github.com/Evolution-X/external_piex synced 2026-01-27 16:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update PIEX am: be90819

Browse Source 
am: 64ab98e

* commit '64ab98ef0f174a9ee82bcc73d2660f5903831016':
  Update PIEX

Change-Id: Ia720d9489673a4ad6d71750f324001915599d528
This commit is contained in:
Yujie Qin
2016-04-14 13:52:33 +00:00
committed by android-build-merger
parent 980d5c4b9b 64ab98ef0f
commit 89379e54c1
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/tiff_parser.cc
View File

@@ -556,7 +556,22 @@ bool GetFullDimension32(const TiffDirectory& tiff_directory,
}
}
if (tiff_directory.Has(kExifTagWidth) && tiff_directory.Has(kExifTagHeight)) {
if (tiff_directory.Has(kExifTagDefaultCropSize)) {
std::vector<std::uint32_t> crop(2);
std::vector<Rational> crop_rational(2);
if (tiff_directory.Get(kExifTagDefaultCropSize, &crop)) {
*width = crop[0];
*height = crop[1];
} else if (tiff_directory.Get(kExifTagDefaultCropSize, &crop_rational) &&
crop_rational[0].denominator != 0 &&
crop_rational[1].denominator != 0) {
*width = crop_rational[0].numerator / crop_rational[0].denominator;
*height = crop_rational[1].numerator / crop_rational[1].denominator;
} else {
return false;
}
} else if (tiff_directory.Has(kExifTagWidth) &&
tiff_directory.Has(kExifTagHeight)) {
if (!tiff_directory.Get(kExifTagWidth, width) ||
!tiff_directory.Get(kExifTagHeight, height)) {
return false;
@@ -585,20 +600,6 @@ bool GetFullDimension32(const TiffDirectory& tiff_directory,
} else {
return false;
}
} else if (tiff_directory.Has(kExifTagDefaultCropSize)) {
std::vector<std::uint32_t> crop(2);
std::vector<Rational> crop_rational(2);
if (tiff_directory.Get(kExifTagDefaultCropSize, &crop)) {
*width = crop[0];
*height = crop[1];
} else if (tiff_directory.Get(kExifTagDefaultCropSize, &crop_rational) &&
crop_rational[0].denominator != 0 &&
crop_rational[1].denominator != 0) {
*width = crop_rational[0].numerator / crop_rational[0].denominator;
*height = crop_rational[1].numerator / crop_rational[1].denominator;
} else {
return false;
}
}
return true;
}

2
src/tiff_parser.h
View File

@@ -28,7 +28,7 @@
namespace piex {
// Specifies the maximum number of pixels for thumbnails in each direction.
const int kThumbnailMaxDimension = 256;
const int kThumbnailMaxDimension = 512;
// Specifies all tags that might be of interest to get the preview data.
enum GpsTags {