aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-10-06 12:10:42 -0400
committerRalph Amissah <ralph@amissah.com>2010-10-06 12:11:03 -0400
commitc7bd43fb216440fa940583fb218446b053f1eea6 (patch)
tree612f188c7bc73eabd4812d1c07abfc8f9c059fe1
parentversion & changelog 2.7.3 (squeeze freeze, fixes) (diff)
dal_images, where image dimensions are set in an object, use those (+changelog &
version date)
-rw-r--r--CHANGELOG_v26
-rw-r--r--data/doc/sisu/v2/CHANGELOG6
-rw-r--r--data/sisu/v2/v/version.yml4
-rw-r--r--lib/sisu/v2/dal_images.rb2
4 files changed, 13 insertions, 5 deletions
diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index 8e5d5216..76d16b5c 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,7 +12,7 @@ Reverse Chronological:
%% Development branch UNSTABLE
-%% 2.7.3.orig.tar.gz (2010-10-03:39/7)
+%% 2.7.3.orig.tar.gz (2010-10-06:40/3)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
sisu_2.7.3.orig.tar.gz
sisu_2.7.3-1.dsc
@@ -24,6 +24,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
implicit calling of -m (creation of document abstraction for processing),
(e.g. when --source or --sisupod is called on its own).
+ * dal_images, where image dimensions are set in an object, use those, (rather
+ than those determined by imagemagick or graphicsmagick). [note: all must be
+ set in an object, or none]
+
* options, a few aliases added (long options)
* urls, cleaning
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index c612e4c1..f41ae081 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,7 +12,7 @@ Reverse Chronological:
%% Development branch UNSTABLE
-%% 2.7.3.orig.tar.gz (2010-10-03:39/7)
+%% 2.7.3.orig.tar.gz (2010-10-06:40/3)
http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
sisu_2.7.3.orig.tar.gz
sisu_2.7.3-1.dsc
@@ -24,6 +24,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_2.7.3.orig.tar.gz
implicit calling of -m (creation of document abstraction for processing),
(e.g. when --source or --sisupod is called on its own).
+ * dal_images, where image dimensions are set in an object, use those, (rather
+ than those determined by imagemagick or graphicsmagick). [note: all must be
+ set in an object, or none]
+
* options, a few aliases added (long options)
* urls, cleaning
diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml
index 216c7b6a..6ad9e890 100644
--- a/data/sisu/v2/v/version.yml
+++ b/data/sisu/v2/v/version.yml
@@ -1,5 +1,5 @@
---
:version: 2.7.3
-:date_stamp: 2010w39/7
-:date: "2010-10-03"
+:date_stamp: 2010w40/3
+:date: "2010-10-06"
:project: SiSU
diff --git a/lib/sisu/v2/dal_images.rb b/lib/sisu/v2/dal_images.rb
index 0b6d2b1e..ed537f22 100644
--- a/lib/sisu/v2/dal_images.rb
+++ b/lib/sisu/v2/dal_images.rb
@@ -83,7 +83,7 @@ module SiSU_images
unless dob.is =~/^table/
dob.obj.strip!
if dob.obj =~/#{Mx[:lnk_o]}\s*\S+\.(?:png|jpg|gif)(?:\s*|\s+.+)?#{Mx[:lnk_c]}(?:#{Mx[:url_o]}\S+?#{Mx[:url_c]}|image)/
- if dob.obj !~/#{Mx[:lnk_o]}\s*\S+\.(?:png|jpg|gif)\s+\d+x\d+\s+/
+ if dob.obj !~/#{Mx[:lnk_o]}\s*\S+\.(?:png|jpg|gif)\s+\d+x\d+/
m=/#{Mx[:lnk_o]}\s*(\S+\.(?:png|jpg|gif))/
if imagemagick_
imgs=dob.obj.scan(m).flatten