Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
poppler
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nathanael Noblet
poppler
Commits
77aa3a00
Commit
77aa3a00
authored
Dec 02, 2019
by
Albert Astals Cid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable modernize-use-emplace
Not claiming copyright since it's a mechanical change
parent
fb285d2c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
cpp/poppler-image.cpp
cpp/poppler-image.cpp
+5
-5
cpp/poppler-page.cpp
cpp/poppler-page.cpp
+1
-1
poppler/ViewerPreferences.cc
poppler/ViewerPreferences.cc
+1
-1
No files found.
.gitlab-ci.yml
View file @
77aa3a00
...
...
@@ -40,7 +40,7 @@ build_clang_libcpp:
script
:
-
git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL} test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
-
mkdir -p build && cd build
-
CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DTESTDATADIR=$PWD/../test-data -DCMAKE_CXX_CLANG_TIDY="clang-tidy;-header-filter=.;-checks=-*,performance-*,,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation;-warnings-as-errors=*" ..
-
CC=clang CXX=clang++ cmake -G Ninja -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DTESTDATADIR=$PWD/../test-data -DCMAKE_CXX_CLANG_TIDY="clang-tidy;-header-filter=.;-checks=-*,performance-*,,bugprone-*,readability-inconsistent-declaration-parameter-name,readability-string-compare,modernize-deprecated-headers,modernize-make-unique,modernize-make-shared,modernize-use-override,modernize-use-equals-delete,
modernize-use-emplace,
-bugprone-narrowing-conversions,-bugprone-macro-parentheses,-bugprone-suspicious-string-compare,-bugprone-incorrect-roundings,-bugprone-undefined-memory-manipulation;-warnings-as-errors=*" ..
-
ninja
-
ctest --output-on-failure
...
...
cpp/poppler-image.cpp
View file @
77aa3a00
...
...
@@ -480,16 +480,16 @@ std::vector<std::string> image::supported_image_formats()
{
std
::
vector
<
std
::
string
>
formats
;
#if defined(ENABLE_LIBPNG)
formats
.
push
_back
(
"png"
);
formats
.
emplace
_back
(
"png"
);
#endif
#if defined(ENABLE_LIBJPEG)
formats
.
push
_back
(
"jpeg"
);
formats
.
push
_back
(
"jpg"
);
formats
.
emplace
_back
(
"jpeg"
);
formats
.
emplace
_back
(
"jpg"
);
#endif
#if defined(ENABLE_LIBTIFF)
formats
.
push
_back
(
"tiff"
);
formats
.
emplace
_back
(
"tiff"
);
#endif
formats
.
push
_back
(
"pnm"
);
formats
.
emplace
_back
(
"pnm"
);
return
formats
;
}
...
...
cpp/poppler-page.cpp
View file @
77aa3a00
...
...
@@ -384,7 +384,7 @@ std::vector<text_box> page::text_list() const
tb
.
m_data
->
char_bboxes
.
reserve
(
word
->
getLength
());
for
(
int
j
=
0
;
j
<
word
->
getLength
();
j
++
)
{
word
->
getCharBBox
(
j
,
&
xMin
,
&
yMin
,
&
xMax
,
&
yMax
);
tb
.
m_data
->
char_bboxes
.
push_back
({
xMin
,
yMin
,
xMax
-
xMin
,
yMax
-
yMin
}
);
tb
.
m_data
->
char_bboxes
.
emplace_back
(
xMin
,
yMin
,
xMax
-
xMin
,
yMax
-
yMin
);
}
output_list
.
push_back
(
std
::
move
(
tb
));
...
...
poppler/ViewerPreferences.cc
View file @
77aa3a00
...
...
@@ -125,7 +125,7 @@ ViewerPreferences::ViewerPreferences(Dict *prefDict)
if
(
obj2
.
isInt
()
&&
(
pageNumber1
=
obj2
.
getInt
())
>=
1
&&
obj3
.
isInt
()
&&
(
pageNumber2
=
obj3
.
getInt
())
>=
1
&&
pageNumber1
<
pageNumber2
)
{
printPageRange
.
push_back
(
std
::
pair
<
int
,
int
>
(
pageNumber1
,
pageNumber2
)
);
printPageRange
.
emplace_back
(
pageNumber1
,
pageNumber2
);
}
else
{
printPageRange
.
clear
();
break
;
...
...
Write
Preview
Markdown
is supported
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