From 39aced2c56d99a67cab9bed8ca254b9712bf9d90 Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 12 Sep 2013 18:14:27 +0000 Subject: [PATCH] .fixed some warnings git-svn-id: svn://ultimatepp.org/upp/trunk@6330 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/SSL/Socket.icpp | 2 +- uppsrc/Sql/SqlCase.cpp | 2 +- uppsrc/plugin/png/pngupp.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/uppsrc/Core/SSL/Socket.icpp b/uppsrc/Core/SSL/Socket.icpp index 88b587b1d..68c37082a 100644 --- a/uppsrc/Core/SSL/Socket.icpp +++ b/uppsrc/Core/SSL/Socket.icpp @@ -123,7 +123,7 @@ bool TcpSocket::SSLImp::Start() SetSSLError("Start: SSL_new"); return false; } - if(!SSL_set_fd(ssl, socket.GetSOCKET())) { + if(!SSL_set_fd(ssl, (int)socket.GetSOCKET())) { SetSSLError("Start: SSL_set_fd"); return false; } diff --git a/uppsrc/Sql/SqlCase.cpp b/uppsrc/Sql/SqlCase.cpp index e309856d6..3baf201a3 100644 --- a/uppsrc/Sql/SqlCase.cpp +++ b/uppsrc/Sql/SqlCase.cpp @@ -321,7 +321,7 @@ String SqlFormat(const char *s, int l) String SqlFormat(const char *s) { - return SqlFormat(s, strlen(s)); + return SqlFormat(s, (int)strlen(s)); } String SqlFormat(const String& x) diff --git a/uppsrc/plugin/png/pngupp.cpp b/uppsrc/plugin/png/pngupp.cpp index 41505ac52..4bc34e60a 100644 --- a/uppsrc/plugin/png/pngupp.cpp +++ b/uppsrc/plugin/png/pngupp.cpp @@ -231,7 +231,7 @@ bool PNGRaster::Create() } */ - data->row_bytes = png_get_rowbytes(data->png_ptr, data->info_ptr); + data->row_bytes = (int)png_get_rowbytes(data->png_ptr, data->info_ptr); data->next_row = 0; data->preload = (interlace_type != PNG_INTERLACE_NONE); data->loaded = false;