diff options
| author | TAKATSU Tomonari <tota@FreeBSD.org> | 2012-12-30 05:32:18 +0000 |
|---|---|---|
| committer | TAKATSU Tomonari <tota@FreeBSD.org> | 2012-12-30 05:32:18 +0000 |
| commit | f2fce843c01048e32848072de0b4b88c73b46317 (patch) | |
| tree | eefa5d5ea8c9a8880048af81015b6f104de1fcf8 /net-im/libjingle/files/patch-talk__session__fileshare__fileshare.cc | |
| parent | -OPTIONSng [1] (diff) | |
- Unbreak on !i386
- Pet portlint
* Convert to new Makefile header
* Remove ABI versions from LIB_DEPENDS
* and so on
PR: ports/169736 (based on)
Submitted by: Hiroshi Nishida <nishida_AT_asusa_DOT_net>
Diffstat (limited to 'net-im/libjingle/files/patch-talk__session__fileshare__fileshare.cc')
| -rw-r--r-- | net-im/libjingle/files/patch-talk__session__fileshare__fileshare.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/net-im/libjingle/files/patch-talk__session__fileshare__fileshare.cc b/net-im/libjingle/files/patch-talk__session__fileshare__fileshare.cc new file mode 100644 index 000000000000..ca08ee80fcdf --- /dev/null +++ b/net-im/libjingle/files/patch-talk__session__fileshare__fileshare.cc @@ -0,0 +1,13 @@ +--- talk/session/fileshare/fileshare.cc.orig 2012-07-05 15:29:12.000000000 -0700 ++++ talk/session/fileshare/fileshare.cc 2012-07-05 15:45:43.000000000 -0700 +@@ -670,8 +670,8 @@ + && !query.empty() + && (sscanf(query.c_str(), "width=%u&height=%u", + &width, &height) == 2)) { +- width = talk_base::_max<unsigned int>(1, talk_base::_min(width, kMaxPreviewSize)); +- height = talk_base::_max<unsigned int>(1, talk_base::_min(height, kMaxPreviewSize)); ++ width = talk_base::_max<unsigned int>(1, talk_base::_min((size_t)width, kMaxPreviewSize)); ++ height = talk_base::_max<unsigned int>(1, talk_base::_min((size_t)height, kMaxPreviewSize)); + std::string pathname; + if (is_sender_) { + talk_base::Pathname local_path;
\ No newline at end of file |