Skip to content

Commit 1f7e80c

Browse files
committed
Avoid compiler warnings about possible loss of data
This quenches the compiler warning of MSVC á la: conversion from 'int64_t' to 'int', possible loss of data Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 6202032 commit 1f7e80c

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

src/deadbeef_rand.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ uint32_t deadbeef_generate_seed(void)
2323
{
2424
uint32_t t = (uint32_t)time(NULL);
2525
uint32_t c = (uint32_t)clock();
26-
return (t << 24) ^ (c << 11) ^ t ^ (size_t) &c;
26+
return (uint32_t)((t << 24) ^ (c << 11) ^ t ^ (size_t) &c);
2727
}

src/main.cc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ Napi::Number _typeStringDelayed(const Napi::CallbackInfo &info)
576576
std::string stringToType = info[0].As<Napi::String>();
577577
size_t cpm = info[1].As<Napi::Number>().Int32Value();
578578

579-
typeStringDelayed(stringToType.c_str(), cpm);
579+
typeStringDelayed(stringToType.c_str(), (unsigned int)cpm);
580580

581581
return Napi::Number::New(env, 1);
582582
}
@@ -613,8 +613,8 @@ Napi::Object _getScreenSize(const Napi::CallbackInfo &info)
613613

614614
//Create our return object.
615615
Napi::Object obj = Napi::Object::New(env);
616-
obj.Set(Napi::String::New(env, "width"), Napi::Number::New(env, displaySize.width));
617-
obj.Set(Napi::String::New(env, "height"), Napi::Number::New(env, displaySize.height));
616+
obj.Set(Napi::String::New(env, "width"), Napi::Number::New(env, (double)displaySize.width));
617+
obj.Set(Napi::String::New(env, "height"), Napi::Number::New(env, (double)displaySize.height));
618618

619619
return obj;
620620
}
@@ -660,7 +660,7 @@ Napi::Number _highlight(const Napi::CallbackInfo &info)
660660
y = info[1].As<Napi::Number>().Int32Value();
661661
width = info[2].As<Napi::Number>().Int32Value();
662662
height = info[3].As<Napi::Number>().Int32Value();
663-
duration = info[4].As<Napi::Number>().Int64Value();
663+
duration = (int)info[4].As<Napi::Number>().Int64Value();
664664
opacity = info[5].As<Napi::Number>().FloatValue();
665665

666666
highlight(x, y, width, height, duration, opacity);
@@ -673,7 +673,7 @@ Napi::Number _getActiveWindow(const Napi::CallbackInfo &info) {
673673
Napi::Env env = info.Env();
674674

675675
WindowHandle windowHandle = getActiveWindow();
676-
return Napi::Number::New(env, windowHandle);
676+
return Napi::Number::New(env, (double)windowHandle);
677677
}
678678

679679
Napi::Array _getWindows(const Napi::CallbackInfo &info) {
@@ -683,7 +683,7 @@ Napi::Array _getWindows(const Napi::CallbackInfo &info) {
683683
auto arr = Napi::Array::New(env, windowHandles.size());
684684

685685
for (size_t idx = 0; idx < windowHandles.size(); ++idx) {
686-
arr[idx] = windowHandles[idx];
686+
arr[(uint32_t)idx] = windowHandles[idx];
687687
}
688688

689689
return arr;
@@ -696,10 +696,10 @@ Napi::Object _getWindowRect(const Napi::CallbackInfo &info) {
696696
MMRect windowRect = getWindowRect(windowHandle);
697697

698698
Napi::Object obj = Napi::Object::New(env);
699-
obj.Set(Napi::String::New(env, "x"), Napi::Number::New(env, windowRect.origin.x));
700-
obj.Set(Napi::String::New(env, "y"), Napi::Number::New(env, windowRect.origin.y));
701-
obj.Set(Napi::String::New(env, "width"), Napi::Number::New(env, windowRect.size.width));
702-
obj.Set(Napi::String::New(env, "height"), Napi::Number::New(env, windowRect.size.height));
699+
obj.Set(Napi::String::New(env, "x"), Napi::Number::New(env, (double)windowRect.origin.x));
700+
obj.Set(Napi::String::New(env, "y"), Napi::Number::New(env, (double)windowRect.origin.y));
701+
obj.Set(Napi::String::New(env, "width"), Napi::Number::New(env, (double)windowRect.size.width));
702+
obj.Set(Napi::String::New(env, "height"), Napi::Number::New(env, (double)windowRect.size.height));
703703

704704
return obj;
705705
}
@@ -763,13 +763,13 @@ Napi::Object _captureScreen(const Napi::CallbackInfo &info)
763763
throw Napi::Error::New(env, "Error: Failed to capture screen");
764764
}
765765

766-
uint32_t bufferSize = bitmap->bytewidth * bitmap->height;
766+
uint32_t bufferSize = (uint32_t)(bitmap->bytewidth * bitmap->height);
767767
Napi::Buffer<char> buffer = Napi::Buffer<char>::New(env, (char *)bitmap->imageBuffer, bufferSize, finalizer);
768768

769769
Napi::Object obj = Napi::Object::New(env);
770-
obj.Set(Napi::String::New(env, "width"), Napi::Number::New(env, bitmap->width));
771-
obj.Set(Napi::String::New(env, "height"), Napi::Number::New(env, bitmap->height));
772-
obj.Set(Napi::String::New(env, "byteWidth"), Napi::Number::New(env, bitmap->bytewidth));
770+
obj.Set(Napi::String::New(env, "width"), Napi::Number::New(env, (double)bitmap->width));
771+
obj.Set(Napi::String::New(env, "height"), Napi::Number::New(env, (double)bitmap->height));
772+
obj.Set(Napi::String::New(env, "byteWidth"), Napi::Number::New(env, (double)bitmap->bytewidth));
773773
obj.Set(Napi::String::New(env, "bitsPerPixel"), Napi::Number::New(env, bitmap->bitsPerPixel));
774774
obj.Set(Napi::String::New(env, "bytesPerPixel"), Napi::Number::New(env, bitmap->bytesPerPixel));
775775
obj.Set(Napi::String::New(env, "image"), buffer);

src/win32/keypress.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void win32KeyEvent(int key, MMKeyFlags flags)
6161

6262
INPUT keyboardInput;
6363
keyboardInput.type = INPUT_KEYBOARD;
64-
keyboardInput.ki.wScan = scan;
64+
keyboardInput.ki.wScan = (WORD)scan;
6565
keyboardInput.ki.dwFlags = KEYEVENTF_SCANCODE | flags;
6666
keyboardInput.ki.time = 0;
6767
SendInput(1, &keyboardInput, sizeof(keyboardInput));
@@ -170,8 +170,8 @@ void typeString(const char *str)
170170
else
171171
continue; /* ignore invalid UTF-8 */
172172

173-
toggleUniKey(n, true);
174-
toggleUniKey(n, false);
173+
toggleUniKey((char)n, true);
174+
toggleUniKey((char)n, false);
175175
}
176176
}
177177

src/win32/mouse.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*/
2727
void moveMouse(MMPoint point)
2828
{
29-
SetCursorPos (point.x, point.y);
29+
SetCursorPos ((int)point.x, (int)point.y);
3030
}
3131

3232
void dragMouse(MMPoint point, const MMMouseButton button)

src/win32/screengrab.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ MMBitmapRef copyMMBitmapFromDisplayInRect(MMRect rect)
3838
(int)rect.size.width,
3939
(int)rect.size.height,
4040
screen,
41-
rect.origin.x,
42-
rect.origin.y,
41+
(int)rect.origin.x,
42+
(int)rect.origin.y,
4343
SRCCOPY)) {
4444

4545
/* Error copying data. */

0 commit comments

Comments
 (0)