summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asdcplib/src/KM_xml.cpp4
-rw-r--r--src/picture_asset.cc7
-rw-r--r--wscript2
3 files changed, 8 insertions, 5 deletions
diff --git a/asdcplib/src/KM_xml.cpp b/asdcplib/src/KM_xml.cpp
index 9521c450..98dccc4b 100644
--- a/asdcplib/src/KM_xml.cpp
+++ b/asdcplib/src/KM_xml.cpp
@@ -990,7 +990,7 @@ Kumu::StringIsXML(const char* document, ui32_t len)
//
bool
-Kumu::XMLElement::ParseString(const char* document, ui32_t doc_len)
+Kumu::XMLElement::ParseString(const char*, ui32_t)
{
DefaultLogSink().Error("Kumu compiled without XML parser support.\n");
return false;
@@ -998,7 +998,7 @@ Kumu::XMLElement::ParseString(const char* document, ui32_t doc_len)
//
bool
-Kumu::StringIsXML(const char* document, ui32_t len)
+Kumu::StringIsXML(const char*, ui32_t)
{
DefaultLogSink().Error("Kumu compiled without XML parser support.\n");
return false;
diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index f5c10ce3..c59664d9 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -238,6 +238,7 @@ PictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt) const
vector<int> abs_diffs (image_A->comps[0].w * image_A->comps[0].h * image_A->numcomps);
int d = 0;
+ int max_diff = 0;
for (int c = 0; c < image_A->numcomps; ++c) {
@@ -247,7 +248,9 @@ PictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt) const
int const pixels = image_A->comps[c].w * image_A->comps[c].h;
for (int j = 0; j < pixels; ++j) {
- abs_diffs[d++] = abs (image_A->comps[c].data[j] - image_B->comps[c].data[j]);
+ int const t = abs (image_A->comps[c].data[j] - image_B->comps[c].data[j]);
+ abs_diffs[d++] = t;
+ max_diff = max (max_diff, t);
}
}
@@ -270,7 +273,7 @@ PictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt) const
}
if (opt.verbose) {
- cout << "\tmean pixel error " << mean << ", standard deviation " << std_dev << "\n";
+ cout << "\tmax pixel error " << max_diff << ", mean pixel error " << mean << ", standard deviation " << std_dev << "\n";
}
opj_image_destroy (image_A);
diff --git a/wscript b/wscript
index 30974ac7..4308252e 100644
--- a/wscript
+++ b/wscript
@@ -2,7 +2,7 @@ import subprocess
import os
APPNAME = 'libdcp'
-VERSION = '0.08pre'
+VERSION = '0.09pre'
def options(opt):
opt.load('compiler_cxx')