Changeset 2388 for trunk/MagicSoft

Timestamp:

10/15/03 20:02:32 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• gui/MGImage.cc (modified) (2 diffs)
• gui/MGImage.h (modified) (1 diff)
• stars.txt (modified) (3 diffs)

trunk/MagicSoft/Cosy/gui/MGImage.cc

@@ -84 +84 @@
 }
 
+void MGImage::DrawImg16(unsigned short *d, char *s, char *e)
+{
+    // d=destination, s=source, e=end
+    // rrrrrggg gggbbbbb
+    //
+    while (s<e)
+    {
+        *d++ = (*s&0xfc) | (*s&0xf8)<<5 | (*s&0xfc)<<11;
+        s++;
+    }
+}
+
 void MGImage::DrawImg32(char *d, char *s, char *e)
 {
     // d=destination, s=source, e=end
+    // rrrrrrrr gggggggg bbbbbbbb aaaaaaaa
+    //
     while (s<e)
     {
@@ -127 +141 @@
     switch (gVirtualX->GetDepth())
     {
+    case 8:
+        memcpy(fImage->data, buffer, fWidth*fHeight);
+        break;
+    case 16:
+        DrawImg16((unsigned short*)fImage->data, (char*)buffer, (char*)(buffer+fWidth*fHeight));
+        break;
     case 32:
         DrawImg32(fImage->data, (char*)buffer, (char*)(buffer+fWidth*fHeight));

trunk/MagicSoft/Cosy/gui/MGImage.h

@@ -35 +35 @@
     enum { kNeedRedraw = BIT(17) };
 
+    void DrawImg16(unsigned short *d, char *s, char *e);
     void DrawImg32(char *d, char *s, char *e);
     void DrawColImg32(char *d, char *s1, char *s2, char *e);

trunk/MagicSoft/Cosy/stars.txt

@@ -1 +1 @@
 12 54 02   55 57 35  Alioth (1.77)
 00 08 24   29 05 26  Alpheratz (2.06)
-19 50 47    8 52 06  Altair (0.77)
+19 50 47   08 52 06  Altair (0.77)
 16 29 25  -26 25 55  Antares (0.96)
 14 15 40   19 10 57  Arcturus (-0.04)
@@ -8 +8 @@
 20 41 26   45 16 49  Deneb (1.25)
 11 03 44   61 45 03  Dubhe (1.79)
-18 24 10  -34 23 5   Kaus Australis (1.85)
+18 24 10  -34 23 05  Kaus Australis (1.85)
+05 34 32   22 00 52  M1 (8.4)
 13 23 56   54 55 31  Mizar A (2.23)
 16 53 52   39 45 37  Mkn 501
@@ -16 +17 @@
 18 55 16  -26 17 48  Sagittarius Sigma-34 (2.02)
 00 40 31   56 32 14  Schedar (2.23)
-13 25 13  -11  9 41  Spica (0.98)
+13 25 13  -11 09 41  Spica (0.98)
 17 37 19  -42 59 52  Theta Scorpionis (1.87)
 18 36 56   38 47 01  Vega (0.03)