On Sat, 23 Feb 2013 01:15:53 -0800 (PST), T. Modes wrote:
> Hi Robert,
>
> On 23 Feb., 03:00, Robert Krawitz <[email protected]> wrote:
>> I've made a few more changes to suppress build noise, attached. I've
>> also attached a build log containing the remaining warnings.
>>
>
> Thanks for the patch. I committed a slightly modified version.
>
> Thomas
Here's another warning fix.
diff -r 074d34083817 src/hugin1/ptbatcher/PTBatcherGUI.cpp
--- a/src/hugin1/ptbatcher/PTBatcherGUI.cpp Sat Feb 23 10:15:41 2013 +0100
+++ b/src/hugin1/ptbatcher/PTBatcherGUI.cpp Sun Feb 24 13:52:15 2013 -0500
@@ -467,7 +467,7 @@
const void* BatchIPCConnection::OnRequest(const wxString& topic, const
wxString& item, size_t* size, wxIPCFormat format)
#else
#define RETURNEMPTYSTRING return ((wxChar*) "")
-wxChar* BatchIPCConnection::OnRequest(const wxString& topic, const wxString&
item, int* size, wxIPCFormat format)
+wxChar* BatchIPCConnection::OnRequest(const wxString& topic, const wxString&
item, size_t* size, wxIPCFormat format)
#endif
{
*size=wxNO_LEN;
diff -r 074d34083817 src/hugin1/ptbatcher/PTBatcherGUI.h
--- a/src/hugin1/ptbatcher/PTBatcherGUI.h Sat Feb 23 10:15:41 2013 +0100
+++ b/src/hugin1/ptbatcher/PTBatcherGUI.h Sun Feb 24 13:52:15 2013 -0500
@@ -58,7 +58,7 @@
#if wxCHECK_VERSION(2,9,0)
virtual const void* OnRequest(const wxString& topic, const wxString& item,
size_t* size = NULL, wxIPCFormat format = wxIPC_TEXT);
#else
- virtual wxChar* OnRequest(const wxString& topic, const wxString& item,
int* size = NULL, wxIPCFormat format = wxIPC_TEXT);
+ virtual wxChar* OnRequest(const wxString& topic, const wxString& item,
size_t* size = NULL, wxIPCFormat format = wxIPC_TEXT);
#endif
};
BTW, I notice that src/hugin1/hugin/xrc/data/help_en_EN/Makefile gets
modified by cmake, resulting in my sandbox always having a big diff in
that file.
--
Robert Krawitz <[email protected]>
MIT VI-3 1987 - Congratulations MIT Engineers men's hoops Final Four!
Tall Clubs International -- http://www.tall.org/ or 1-888-IM-TALL-2
Member of the League for Programming Freedom -- http://ProgFree.org
Project lead for Gutenprint -- http://gimp-print.sourceforge.net
"Linux doesn't dictate how I work, I dictate how Linux works."
--Eric Crampton
--
--
You received this message because you are subscribed to the Google Groups
"Hugin and other free panoramic software" group.
A list of frequently asked questions is available at:
http://wiki.panotools.org/Hugin_FAQ
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at http://groups.google.com/group/hugin-ptx
---
You received this message because you are subscribed to the Google Groups
"hugin and other free panoramic software" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
