cpp/poppler-document-private.h | 2 +- cpp/poppler-document.cpp | 2 +- cpp/poppler-embedded-file.cpp | 2 +- cpp/poppler-embedded-file.h | 2 +- cpp/poppler-global.cpp | 7 ++++--- cpp/poppler-global.h | 6 +++--- cpp/poppler-page.cpp | 4 ++-- cpp/poppler-page.h | 2 +- cpp/poppler-rectangle.h | 2 +- cpp/poppler-toc.cpp | 2 +- cpp/poppler-version.cpp | 2 +- cpp/tests/poppler-dump.cpp | 2 +- 12 files changed, 18 insertions(+), 17 deletions(-)
New commits: commit ae740c5cfefbae13f82b750e39fa3dbbdc94858b Author: Pino Toscano <[email protected]> Date: Tue Mar 2 23:22:06 2010 +0100 [cpp] update the copyrights diff --git a/cpp/poppler-document-private.h b/cpp/poppler-document-private.h index 9568166..54deeb9 100644 --- a/cpp/poppler-document-private.h +++ b/cpp/poppler-document-private.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009, Pino Toscano <[email protected]> + * Copyright (C) 2009-2010, Pino Toscano <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/cpp/poppler-document.cpp b/cpp/poppler-document.cpp index 50d451f..ff1beaa 100644 --- a/cpp/poppler-document.cpp +++ b/cpp/poppler-document.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009, Pino Toscano <[email protected]> + * Copyright (C) 2009-2010, Pino Toscano <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/cpp/poppler-embedded-file.cpp b/cpp/poppler-embedded-file.cpp index bbf097f..bd53a13 100644 --- a/cpp/poppler-embedded-file.cpp +++ b/cpp/poppler-embedded-file.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009, Pino Toscano <[email protected]> + * Copyright (C) 2009-2010, Pino Toscano <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/cpp/poppler-embedded-file.h b/cpp/poppler-embedded-file.h index e493c9e..e4f5c91 100644 --- a/cpp/poppler-embedded-file.h +++ b/cpp/poppler-embedded-file.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009, Pino Toscano <[email protected]> + * Copyright (C) 2009-2010, Pino Toscano <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/cpp/poppler-global.cpp b/cpp/poppler-global.cpp index 7e4fd5e..bb988a0 100644 --- a/cpp/poppler-global.cpp +++ b/cpp/poppler-global.cpp @@ -1,5 +1,6 @@ /* - * Copyright (C) 2009, Pino Toscano <[email protected]> + * Copyright (C) 2009-2010, Pino Toscano <[email protected]> + * Copyright (C) 2010, Hib Eris <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h index 73bbfdc..77fe3b4 100644 --- a/cpp/poppler-global.h +++ b/cpp/poppler-global.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009, Pino Toscano <[email protected]> + * Copyright (C) 2009-2010, Pino Toscano <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/cpp/poppler-page.cpp b/cpp/poppler-page.cpp index 8c0910a..e61415c 100644 --- a/cpp/poppler-page.cpp +++ b/cpp/poppler-page.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009, Pino Toscano <[email protected]> + * Copyright (C) 2009-2010, Pino Toscano <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/cpp/poppler-page.h b/cpp/poppler-page.h index 308afd3..89fdea6 100644 --- a/cpp/poppler-page.h +++ b/cpp/poppler-page.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009, Pino Toscano <[email protected]> + * Copyright (C) 2009-2010, Pino Toscano <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/cpp/poppler-rectangle.h b/cpp/poppler-rectangle.h index dabacc9..365d07c 100644 --- a/cpp/poppler-rectangle.h +++ b/cpp/poppler-rectangle.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009, Pino Toscano <[email protected]> + * Copyright (C) 2009-2010, Pino Toscano <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/cpp/poppler-toc.cpp b/cpp/poppler-toc.cpp index 9789221..a3149c6 100644 --- a/cpp/poppler-toc.cpp +++ b/cpp/poppler-toc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009, Pino Toscano <[email protected]> + * Copyright (C) 2009-2010, Pino Toscano <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/cpp/poppler-version.cpp b/cpp/poppler-version.cpp index 88756ba..dcc100f 100644 --- a/cpp/poppler-version.cpp +++ b/cpp/poppler-version.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009, Pino Toscano <[email protected]> + * Copyright (C) 2009-2010, Pino Toscano <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/cpp/tests/poppler-dump.cpp b/cpp/tests/poppler-dump.cpp index cdfdcd0..104aaa4 100644 --- a/cpp/tests/poppler-dump.cpp +++ b/cpp/tests/poppler-dump.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009, Pino Toscano <[email protected]> + * Copyright (C) 2009-2010, Pino Toscano <[email protected]> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by commit 24b1d8d0b4ae7cea9fbc331f19cd5ce3917b8b4d Author: Pino Toscano <[email protected]> Date: Tue Mar 2 23:15:56 2010 +0100 [cpp] {from,to}_utf_8() -> {from,to}_utf8() diff --git a/cpp/poppler-global.cpp b/cpp/poppler-global.cpp index adc1f3c..7e4fd5e 100644 --- a/cpp/poppler-global.cpp +++ b/cpp/poppler-global.cpp @@ -85,7 +85,7 @@ ustring::~ustring() { } -byte_array ustring::to_utf_8() const +byte_array ustring::to_utf8() const { if (!size()) { return byte_array(); @@ -132,7 +132,7 @@ std::string ustring::to_latin1() const return ret; } -ustring ustring::from_utf_8(const char *str, int len) +ustring ustring::from_utf8(const char *str, int len) { if (len <= 0) { len = std::strlen(str); diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h index b19378c..73bbfdc 100644 --- a/cpp/poppler-global.h +++ b/cpp/poppler-global.h @@ -78,10 +78,10 @@ public: ustring(size_type len, value_type ch); ~ustring(); - byte_array to_utf_8() const; + byte_array to_utf8() const; std::string to_latin1() const; - static ustring from_utf_8(const char *str, int len = -1); + static ustring from_utf8(const char *str, int len = -1); static ustring from_latin1(const std::string &str); private: diff --git a/cpp/poppler-page.cpp b/cpp/poppler-page.cpp index 5a0c29c..8c0910a 100644 --- a/cpp/poppler-page.cpp +++ b/cpp/poppler-page.cpp @@ -184,5 +184,5 @@ ustring page::text(const rectf &r) const } else { s.reset(td.getText(r.left(), r.top(), r.right(), r.bottom())); } - return ustring::from_utf_8(s->getCString()); + return ustring::from_utf8(s->getCString()); } _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
