Ticket #9290: 0001-Fix-more-GCC4-narrowing-conversion-warnings.patch

headers/os/bluetooth/LinkKeyUtils.h

@@ -48 +48 @@
                             &l14, &l15);
 
             if (count == 16) {
-                return (linkkey_t){{l0, l1, l2, l3, l4, l5, l6, l7, l8,
-                    l9, l10, l11, l12, l13, l14, l15}};
+                return (linkkey_t){{(uint8)l0, (uint8)l1, (uint8)l2, (uint8)l3,
+                    (uint8)l4, (uint8)l5, (uint8)l6, (uint8)l7, (uint8)l8,
+                    (uint8)l9, (uint8)l10, (uint8)l11, (uint8)l12, (uint8)l13,
+                    (uint8)l14, (uint8)l15}};
             }
         }
 

headers/os/bluetooth/bdaddrUtils.h

@@ -66 +66 @@
                         &b5, &b4, &b3, &b2, &b1, &b0);
 
             if (count == 6)
-                return ((bdaddr_t) {{b0, b1, b2, b3, b4, b5}});
+                return ((bdaddr_t) {{(uint8)b0, (uint8)b1, (uint8)b2,
+                    (uint8)b3, (uint8)b4, (uint8)b5}});
         }
 
         return NullAddress();

src/add-ons/print/drivers/pdf/source/PDFText.cpp

@@ -320 +320 @@
 PDFWriter::ToPDFUnicode(const char *string, BString &unicode)
 {
     // PDFlib requires BOM at begin and two 0 at end of string
-    char marker[3] = { 0xfe, 0xff, 0}; // byte order marker
+    char marker[3] = {'\xfe', '\xff', 0}; // byte order marker
     BString s;
     ToUnicode(string, s);
     unicode << marker;

src/add-ons/screen_savers/message/Message.cpp

@@ -176 +176 @@
     buffer.Lock();
 
     // Set up the colors
-    rgb_color base_color = {rand() % 25, rand() % 25, rand() % 25};
+    rgb_color base_color = {(uint8)(rand() % 25), (uint8)(rand() % 25),
+        (uint8)(rand() % 25)};
     offscreen.SetHighColor(base_color); 
     offscreen.SetLowColor(tint_color(base_color, 0.815F));
     offscreen.FillRect(offscreen.Bounds(), kCheckered);

src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorSlider.cpp

@@ -439 +439 @@
         R*=255.0; G*=255.0; B*=255.0;
     }
     
-    rgb_color color = { round(R), round(G), round(B), 255 };
+    rgb_color color = {(uint8)round(R), (uint8)round(G),
+        (uint8)round(B), 255 };
     
     fMode = mode;
     SetOtherValues(value1, value2);
@@ -638 +639 @@
 ColorSlider::_DrawColorLineY(BView *view, float y,
                              int r, int g, int b)
 {
-    rgb_color color = { r, g, b, 255 };
+    rgb_color color = {(uint8)r, (uint8)g, (uint8)b, 255 };
     y = 255.0 - y;
     view->AddLine( BPoint(8.0, y + 5.0), BPoint(27.0, y + 5.0), color );
 }
@@ -648 +649 @@
 ColorSlider::_DrawColorLineX(BView *view, float x,
                              int r, int g, int b)
 {
-    rgb_color color = { r, g, b, 255 };
+    rgb_color color = {(uint8)r, (uint8)g, (uint8)b, 255 };
     BRect bounds(view->Bounds());
     x = (255.0 - x) * (bounds.Width() - 2.0) / 255.0 + 2.0;
     view->AddLine( BPoint(x, bounds.top + 2.0), BPoint(x, bounds.bottom - 2.0), color );

src/apps/mediaplayer/media_node_framework/NodeManager.cpp

@@ -393 +393 @@
     format.type = B_MEDIA_RAW_VIDEO;
     media_raw_video_format videoFormat = {
         FramesPerSecond(), 1, 0,
-        fVideoBounds.IntegerWidth(),
+        (uint32)fVideoBounds.IntegerWidth(),
         B_VIDEO_TOP_LEFT_RIGHT, 1, 1,
         {
             preferredVideoFormat,
-            fVideoBounds.IntegerWidth() + 1,
-            fVideoBounds.IntegerHeight() + 1,
+            (uint32)(fVideoBounds.IntegerWidth() + 1),
+            (uint32)(fVideoBounds.IntegerHeight() + 1),
             0, 0, 0
         }
     };