Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Graphics
libkexiv2
Commits
8498b1b0
Commit
8498b1b0
authored
Feb 22, 2015
by
Gilles Caulier
🗼
Browse files
apply patch #91206 from MAik Qualmann to fix rotation matrix issue in libkexiv2
BUGS: 344155
FIXED-IN: 4.8.0
parent
48a2e4ce
Changes
2
Hide whitespace changes
Inline
Side-by-side
libkexiv2/rotationmatrix.cpp
View file @
8498b1b0
...
...
@@ -7,7 +7,7 @@
* @date 2009-08-03
* @brief Tools for combining rotation operations
*
* @author Copyright (C) 2006-201
2
by Gilles Caulier
* @author Copyright (C) 2006-201
5
by Gilles Caulier
* <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
* @author Copyright (C) 2004-2012 by Marcel Wiesweg
* <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
...
...
@@ -65,9 +65,9 @@ namespace KExiv2Iface
(I did not proof that mathematically, but empirically)
static const RotationMatrix identity; //( 1, 0, 0, 1)
static const RotationMatrix rotate90; //( 0,
-
1,
1, 0)
static const RotationMatrix rotate90; //( 0,
1,
-
1, 0)
static const RotationMatrix rotate180; //(-1, 0, 0, -1)
static const RotationMatrix rotate270; //( 0,
1,
-
1, 0)
static const RotationMatrix rotate270; //( 0,
-
1,
1, 0)
static const RotationMatrix flipHorizontal; //(-1, 0, 0, 1)
static const RotationMatrix flipVertical; //( 1, 0, 0, -1)
static const RotationMatrix rotate90flipHorizontal; //( 0, 1, 1, 0), first rotate, then flip
...
...
@@ -79,9 +79,9 @@ namespace Matrix
{
static
const
RotationMatrix
identity
(
1
,
0
,
0
,
1
);
static
const
RotationMatrix
rotate90
(
0
,
-
1
,
1
,
0
);
static
const
RotationMatrix
rotate90
(
0
,
1
,
-
1
,
0
);
static
const
RotationMatrix
rotate180
(
-
1
,
0
,
0
,
-
1
);
static
const
RotationMatrix
rotate270
(
0
,
1
,
-
1
,
0
);
static
const
RotationMatrix
rotate270
(
0
,
-
1
,
1
,
0
);
static
const
RotationMatrix
flipHorizontal
(
-
1
,
0
,
0
,
1
);
static
const
RotationMatrix
flipVertical
(
1
,
0
,
0
,
-
1
);
static
const
RotationMatrix
rotate90flipHorizontal
(
0
,
1
,
1
,
0
);
...
...
@@ -104,6 +104,7 @@ RotationMatrix matrix(RotationMatrix::TransformationAction action)
case
RotationMatrix
::
Rotate270
:
return
rotate270
;
}
return
identity
;
}
...
...
@@ -130,6 +131,7 @@ RotationMatrix matrix(KExiv2::ImageOrientation exifOrientation)
case
KExiv2
::
ORIENTATION_UNSPECIFIED
:
return
identity
;
}
return
identity
;
}
...
...
libkexiv2/rotationmatrix.h
View file @
8498b1b0
...
...
@@ -7,7 +7,7 @@
* @date 2009-08-03
* @brief Tools for combining rotation operations
*
* @author Copyright (C) 2006-201
2
by Gilles Caulier
* @author Copyright (C) 2006-201
5
by Gilles Caulier
* <a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
* @author Copyright (C) 2004-2012 by Marcel Wiesweg
* <a href="mailto:marcel dot wiesweg at gmx dot de">marcel dot wiesweg at gmx dot de</a>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment