Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 18:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix various compiler warnings on windows

Browse Source
This commit is contained in:
Kovid Goyal 2021-03-18 20:24:20 +05:30
parent 3f16d63392
commit 6c972df3ba
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/srv/fast_css_transform.cpp
View File

@ -138,7 +138,7 @@ static ParsedNumber
parse_css_number(const T &src, size_t limit = 0) { parse_css_number(const T &src, size_t limit = 0) {
int sign = 1, exponent_sign = 1; int sign = 1, exponent_sign = 1;
integer_type integer_part = 0, fractional_part = 0, exponent_part = 0; integer_type integer_part = 0, fractional_part = 0, exponent_part = 0;
unsigned num_of_fractional_digits = 0; size_t num_of_fractional_digits = 0;
size_t first_digit = 0, last_digit = 0; size_t first_digit = 0, last_digit = 0;
const size_t src_sz = limit ? limit : src.size(); const size_t src_sz = limit ? limit : src.size();
size_t pos = 0; size_t pos = 0;
@ -163,7 +163,7 @@ parse_css_number(const T &src, size_t limit = 0) {
read_integer(exponent_part); read_integer(exponent_part);
} }
if (fractional_part || (exponent_part && exponent_sign == -1)) { if (fractional_part || (exponent_part && exponent_sign == -1)) {
double ans = integer_part; double ans = (double)integer_part;
if (fractional_part) ans += ((double) fractional_part) / ((double)(ipow(10, num_of_fractional_digits))); if (fractional_part) ans += ((double) fractional_part) / ((double)(ipow(10, num_of_fractional_digits)));
if (exponent_part) { if (exponent_part) {
if (exponent_sign == -1) ans /= (double)ipow(10, exponent_part); if (exponent_sign == -1) ans /= (double)ipow(10, exponent_part);
@ -238,8 +238,7 @@ class Token {
private: private:
TokenType type; TokenType type;
std::u32string text; std::u32string text;
unsigned unit_at; size_t unit_at, out_pos;
size_t out_pos;
void clear() { void clear() {
type = TokenType::whitespace; type = TokenType::whitespace;
@ -726,10 +725,10 @@ class Parser {
token_queue.add_char(ch); token_queue.add_char(ch);
return; return;
} }
escape_buf[escape_buf_pos++] = ch; escape_buf[escape_buf_pos++] = (char)ch;
return; return;
} }
if (is_hex_char(ch) && escape_buf_pos < 6) { escape_buf[escape_buf_pos++] = ch; return; } if (is_hex_char(ch) && escape_buf_pos < 6) { escape_buf[escape_buf_pos++] = (char)ch; return; }
if (is_whitespace(ch)) return; // a single whitespace character is absorbed into escape if (is_whitespace(ch)) return; // a single whitespace character is absorbed into escape
reconsume(); reconsume();
states.pop(); states.pop();
@ -1023,8 +1022,10 @@ class Parser {
#define handle_exceptions(msg) \ #define handle_exceptions(msg) \
catch (std::bad_alloc &ex) { \ catch (std::bad_alloc &ex) { \
(void)ex; \
return PyErr_NoMemory(); \ return PyErr_NoMemory(); \
} catch (python_error &ex) { \ } catch (python_error &ex) { \
(void)ex; \
return NULL; \ return NULL; \
} catch (std::exception &ex) { \ } catch (std::exception &ex) { \
PyErr_SetString(PyExc_Exception, ex.what()); \ PyErr_SetString(PyExc_Exception, ex.what()); \