Update to 0.33.0

Resolves: #1190427
This commit is contained in:
Marek Kasik 2015-06-05 14:29:31 +02:00
parent b5f63087d5
commit 63fa04d8c1
4 changed files with 17 additions and 12 deletions

1
.gitignore vendored
View File

@ -17,3 +17,4 @@
/poppler-0.26.4.tar.xz /poppler-0.26.4.tar.xz
/poppler-0.28.1.tar.xz /poppler-0.28.1.tar.xz
/poppler-0.30.0.tar.xz /poppler-0.30.0.tar.xz
/poppler-0.33.0.tar.xz

View File

@ -16,9 +16,9 @@ diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc
index 7c2ca78..e93908c 100644 index 7c2ca78..e93908c 100644
--- a/poppler/TextOutputDev.cc --- a/poppler/TextOutputDev.cc
+++ b/poppler/TextOutputDev.cc +++ b/poppler/TextOutputDev.cc
@@ -173,6 +173,12 @@ @@ -178,6 +178,12 @@
// Max distance between edge of text and edge of link border #define combMaxMidDelta 0.3
#define hyperlinkSlack 2 #define combMaxBaseDelta 0.4
+// Returns whether x is between a and b or equal to a or b. +// Returns whether x is between a and b or equal to a or b.
+// a and b don't need to be sorted. +// a and b don't need to be sorted.
@ -29,7 +29,7 @@ index 7c2ca78..e93908c 100644
//------------------------------------------------------------------------ //------------------------------------------------------------------------
// TextUnderline // TextUnderline
//------------------------------------------------------------------------ //------------------------------------------------------------------------
@@ -4222,11 +4228,37 @@ void TextSelectionSizer::visitLine (TextLine *line, @@ -4411,11 +4417,37 @@ void TextSelectionSizer::visitLine (TextLine *line,
PDFRectangle *rect; PDFRectangle *rect;
double x1, y1, x2, y2, margin; double x1, y1, x2, y2, margin;
@ -72,7 +72,7 @@ index 7c2ca78..e93908c 100644
rect = new PDFRectangle (floor (x1 * scale), rect = new PDFRectangle (floor (x1 * scale),
floor (y1 * scale), floor (y1 * scale),
@@ -4310,19 +4341,56 @@ void TextSelectionPainter::visitLine (TextLine *line, @@ -4499,19 +4531,56 @@ void TextSelectionPainter::visitLine (TextLine *line,
{ {
double x1, y1, x2, y2, margin; double x1, y1, x2, y2, margin;
@ -140,7 +140,7 @@ index 7c2ca78..e93908c 100644
ictm.transform(x1, y1, &x1, &y1); ictm.transform(x1, y1, &x1, &y1);
ictm.transform(x2, y2, &x2, &y2); ictm.transform(x2, y2, &x2, &y2);
@@ -4400,17 +4467,27 @@ void TextWord::visitSelection(TextSelectionVisitor *visitor, @@ -4589,17 +4658,27 @@ void TextWord::visitSelection(TextSelectionVisitor *visitor,
SelectionStyle style) SelectionStyle style)
{ {
int i, begin, end; int i, begin, end;
@ -174,7 +174,7 @@ index 7c2ca78..e93908c 100644
} }
/* Skip empty selection. */ /* Skip empty selection. */
@@ -4426,30 +4503,41 @@ void TextLine::visitSelection(TextSelectionVisitor *visitor, @@ -4615,30 +4694,41 @@ void TextLine::visitSelection(TextSelectionVisitor *visitor,
TextWord *p, *begin, *end, *current; TextWord *p, *begin, *end, *current;
int i, edge_begin, edge_end; int i, edge_begin, edge_end;
PDFRectangle child_selection; PDFRectangle child_selection;
@ -228,7 +228,7 @@ index 7c2ca78..e93908c 100644
end = p->next; end = p->next;
current = p; current = p;
} }
@@ -4461,23 +4549,42 @@ void TextLine::visitSelection(TextSelectionVisitor *visitor, @@ -4650,23 +4740,42 @@ void TextLine::visitSelection(TextSelectionVisitor *visitor,
child_selection = *selection; child_selection = *selection;
if (style == selectionStyleWord) { if (style == selectionStyleWord) {

View File

@ -1,7 +1,7 @@
Summary: PDF rendering library Summary: PDF rendering library
Name: poppler Name: poppler
Version: 0.30.0 Version: 0.33.0
Release: 5%{?dist} Release: 1%{?dist}
License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
Group: Development/Libraries Group: Development/Libraries
URL: http://poppler.freedesktop.org/ URL: http://poppler.freedesktop.org/
@ -213,7 +213,7 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING README %doc COPYING README
%{_libdir}/libpoppler.so.49* %{_libdir}/libpoppler.so.52*
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -282,6 +282,10 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
%changelog %changelog
* Fri Jun 5 2015 Marek Kasik <mkasik@redhat.com> - 0.33.0-1
- Update to 0.33.0
- Resolves: #1190427
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.30.0-5 * Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.30.0-5
- Rebuilt for GCC 5 C++11 ABI change - Rebuilt for GCC 5 C++11 ABI change

View File

@ -1 +1 @@
fb0a9d82b5433c823421a123eb8e9789 poppler-0.30.0.tar.xz 69927d1614d6704021c0b0dd0ee6a852 poppler-0.33.0.tar.xz