From 7f2142d63c5fe94de84f50a026c8fae30e86efe1 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Tue, 23 Aug 2016 20:49:41 +1000 Subject: [PATCH] Fix EXIF tag and version numbering Former-commit-id: 2175e57a38ab45f0eb2f158be17ad7391576f6a4 Former-commit-id: 9169b06fae3fd325ec3942a21efca43d6e9f718c Former-commit-id: f19ea9c05fd5824d8e2cad1e216b8ab9377ef7d9 --- ImageProcessorCore.sln | 2 ++ build/appveyor-project-version-patch.js | 8 ++++---- src/ImageProcessorCore/Profiles/Exif/ExifTag.cs | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ImageProcessorCore.sln b/ImageProcessorCore.sln index 28b7b107c..3ea906ace 100644 --- a/ImageProcessorCore.sln +++ b/ImageProcessorCore.sln @@ -9,9 +9,11 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImageProcessorCore.Tests", EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}" ProjectSection(SolutionItems) = preProject + build\appveyor-project-version-patch.js = build\appveyor-project-version-patch.js appveyor.yml = appveyor.yml build\dotnet-latest.ps1 = build\dotnet-latest.ps1 global.json = global.json + build\package.json = build\package.json README.md = README.md EndProjectSection EndProject diff --git a/build/appveyor-project-version-patch.js b/build/appveyor-project-version-patch.js index 5fcf658e0..1e554116a 100644 --- a/build/appveyor-project-version-patch.js +++ b/build/appveyor-project-version-patch.js @@ -1,13 +1,13 @@ -var jsonfile = require('jsonfile'); -var semver = require('semver'); +var jsonfile = require("jsonfile"); +var semver = require("semver"); -var file = '../src/imageprocessorcore/project.json'; +var file = "../src/imageprocessorcore/project.json"; var buildVersion = process.env.APPVEYOR_BUILD_VERSION.substring(1); var findPoint = buildVersion.lastIndexOf("."); var basePackageVer = buildVersion.substring(0, findPoint); var buildNumber = buildVersion.substring(findPoint + 1, buildVersion.length); -var semversion = semver.valid(basePackageVer + '-alpha-' + buildNumber) +var semversion = semver.valid(basePackageVer + "-alpha" + buildNumber); jsonfile.readFile(file, function (err, project) { project.version = semversion; diff --git a/src/ImageProcessorCore/Profiles/Exif/ExifTag.cs b/src/ImageProcessorCore/Profiles/Exif/ExifTag.cs index 3e9813c00..e8be74427 100644 --- a/src/ImageProcessorCore/Profiles/Exif/ExifTag.cs +++ b/src/ImageProcessorCore/Profiles/Exif/ExifTag.cs @@ -413,8 +413,8 @@ namespace ImageProcessorCore [ExifTagDescription((ushort)2, "Signed")] [ExifTagDescription((ushort)3, "Float")] [ExifTagDescription((ushort)4, "Undefined")] - [ExifTagDescription((ushort)5, "Complex")] - [ExifTagDescription((ushort)6, "Complex")] + [ExifTagDescription((ushort)5, "Complex int")] + [ExifTagDescription((ushort)6, "Complex float")] SampleFormat = 0x0153, ///