Changeset 210


Ignore:
Timestamp:
Mar 19, 2011, 12:26:06 PM (14 years ago)
Author:
george
Message:
  • Fixed: Displaying BGRABitmap on Linux.
Location:
GraphicTest
Files:
18 added
1 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • GraphicTest/GraphicTest.lpi

    r206 r210  
    7575        <IsPartOfProject Value="True"/>
    7676        <UnitName Value="UPlatform"/>
    77         <EditorIndex Value="16"/>
     77        <EditorIndex Value="7"/>
    7878        <WindowIndex Value="0"/>
    7979        <TopLine Value="43"/>
    … …  
    184184        <EditorIndex Value="2"/>
    185185        <WindowIndex Value="0"/>
    186         <TopLine Value="121"/>
    187         <CursorPos X="3" Y="145"/>
     186        <TopLine Value="126"/>
     187        <CursorPos X="57" Y="135"/>
    188188        <UsageCount Value="31"/>
    189189        <Loaded Value="True"/>
    … …  
    202202      <Unit19>
    203203        <Filename Value="../../../Projekty2/FreePascalManager/trunk/Instance/1/Lazarus/lcl/include/rasterimage.inc"/>
    204         <EditorIndex Value="8"/>
    205204        <WindowIndex Value="0"/>
    206205        <TopLine Value="292"/>
    207206        <CursorPos X="1" Y="308"/>
    208207        <UsageCount Value="14"/>
    209         <Loaded Value="True"/>
    210208      </Unit19>
    211209      <Unit20>
    … …  
    239237      <Unit23>
    240238        <Filename Value="../../../Projekty2/FreePascalManager/trunk/Instance/1/Lazarus/lcl/include/winapih.inc"/>
    241         <EditorIndex Value="14"/>
    242239        <WindowIndex Value="0"/>
    243240        <TopLine Value="32"/>
    244241        <CursorPos X="10" Y="45"/>
    245242        <UsageCount Value="13"/>
    246         <Loaded Value="True"/>
    247243      </Unit23>
    248244      <Unit24>
    249245        <Filename Value="../../../Projekty2/FreePascalManager/trunk/Instance/1/Lazarus/lcl/include/winapi.inc"/>
    250         <EditorIndex Value="15"/>
    251246        <WindowIndex Value="0"/>
    252247        <TopLine Value="51"/>
    253248        <CursorPos X="3" Y="53"/>
    254249        <UsageCount Value="13"/>
    255         <Loaded Value="True"/>
    256250      </Unit24>
    257251      <Unit25>
    258252        <Filename Value="../../../Projekty2/FreePascalManager/trunk/Instance/1/Lazarus/lcl/graphics.pp"/>
    259253        <UnitName Value="Graphics"/>
    260         <EditorIndex Value="11"/>
    261254        <WindowIndex Value="0"/>
    262255        <TopLine Value="1314"/>
    263256        <CursorPos X="31" Y="1327"/>
    264257        <UsageCount Value="13"/>
    265         <Loaded Value="True"/>
    266258      </Unit25>
    267259      <Unit26>
    268260        <Filename Value="../../../Projekty2/FreePascalManager/trunk/Instance/1/FPC/rtl/objpas/classes/classesh.inc"/>
    269         <EditorIndex Value="10"/>
    270261        <WindowIndex Value="0"/>
    271262        <TopLine Value="1883"/>
    272263        <CursorPos X="10" Y="1896"/>
    273264        <UsageCount Value="13"/>
    274         <Loaded Value="True"/>
    275265      </Unit26>
    276266      <Unit27>
    … …  
    291281        <Filename Value="bgrabitmap/bgrabitmaptypes.pas"/>
    292282        <UnitName Value="BGRABitmapTypes"/>
    293         <EditorIndex Value="9"/>
     283        <EditorIndex Value="6"/>
    294284        <WindowIndex Value="0"/>
    295285        <TopLine Value="24"/>
    … …  
    301291        <Filename Value="../../../Projekty2/FreePascalManager/trunk/Instance/1/Lazarus/lcl/graphtype.pp"/>
    302292        <UnitName Value="GraphType"/>
    303         <EditorIndex Value="7"/>
    304293        <WindowIndex Value="0"/>
    305294        <TopLine Value="271"/>
    306295        <CursorPos X="23" Y="292"/>
    307296        <UsageCount Value="11"/>
    308         <Loaded Value="True"/>
    309297      </Unit30>
    310298      <Unit31>
    … …  
    319307        <Filename Value="../../../Projekty2/FreePascalManager/trunk/Instance/1/FPC/packages/fcl-image/src/fpimage.pp"/>
    320308        <UnitName Value="FPimage"/>
    321         <EditorIndex Value="13"/>
    322309        <WindowIndex Value="0"/>
    323310        <TopLine Value="23"/>
    324311        <CursorPos X="4" Y="35"/>
    325312        <UsageCount Value="10"/>
    326         <Loaded Value="True"/>
    327313      </Unit32>
    328314      <Unit33>
    329315        <Filename Value="../../../Projekty2/FreePascalManager/trunk/Instance/1/Lazarus/lcl/include/canvas.inc"/>
    330         <EditorIndex Value="12"/>
    331316        <WindowIndex Value="0"/>
    332317        <TopLine Value="1456"/>
    333318        <CursorPos X="1" Y="1471"/>
    334319        <UsageCount Value="10"/>
    335         <Loaded Value="True"/>
    336320      </Unit33>
    337321      <Unit34>
    338322        <Filename Value="../../../Projekty2/FreePascalManager/trunk/Instance/1/FPC/rtl/win/wininc/func.inc"/>
    339         <EditorIndex Value="6"/>
    340323        <WindowIndex Value="0"/>
    341324        <TopLine Value="780"/>
    342325        <CursorPos X="10" Y="793"/>
    343326        <UsageCount Value="10"/>
    344         <Loaded Value="True"/>
    345327      </Unit34>
    346328      <Unit35>
    … …  
    355337      </Unit35>
    356338    </Units>
    357     <JumpHistory Count="30" HistoryIndex="26">
     339    <JumpHistory Count="22" HistoryIndex="18">
    358340      <Position1>
    359341        <Filename Value="bgrabitmap/bgradefaultbitmap.pas"/>
    … …  
    393375      </Position9>
    394376      <Position10>
    395         <Filename Value="../../../Projekty2/FreePascalManager/trunk/Instance/1/Lazarus/lcl/include/canvas.inc"/>
    396         <Caret Line="1469" Column="1" TopLine="1456"/>
     377        <Filename Value="bgrabitmap/bgrawinbitmap.pas"/>
     378        <Caret Line="136" Column="12" TopLine="128"/>
    397379      </Position10>
    398380      <Position11>
    399         <Filename Value="../../../Projekty2/FreePascalManager/trunk/Instance/1/Lazarus/lcl/include/canvas.inc"/>
    400         <Caret Line="1470" Column="1" TopLine="1456"/>
     381        <Filename Value="bgrabitmap/bgrawinbitmap.pas"/>
     382        <Caret Line="137" Column="7" TopLine="113"/>
    401383      </Position11>
    402384      <Position12>
    403         <Filename Value="../../../Projekty2/FreePascalManager/trunk/Instance/1/Lazarus/lcl/include/canvas.inc"/>
    404         <Caret Line="1471" Column="1" TopLine="1456"/>
     385        <Filename Value="bgrabitmap/bgrawinbitmap.pas"/>
     386        <Caret Line="146" Column="1" TopLine="133"/>
    405387      </Position12>
    406388      <Position13>
    407         <Filename Value="bgrabitmap/bgrawinbitmap.pas"/>
    408         <Caret Line="136" Column="12" TopLine="128"/>
     389        <Filename Value="bgrabitmap/bgradefaultbitmap.pas"/>
     390        <Caret Line="1069" Column="1" TopLine="1048"/>
    409391      </Position13>
    410392      <Position14>
    411         <Filename Value="bgrabitmap/bgrawinbitmap.pas"/>
    412         <Caret Line="137" Column="7" TopLine="113"/>
     393        <Filename Value="bgrabitmap/bgradefaultbitmap.pas"/>
     394        <Caret Line="1055" Column="25" TopLine="1048"/>
    413395      </Position14>
    414396      <Position15>
    415         <Filename Value="bgrabitmap/bgrawinbitmap.pas"/>
    416         <Caret Line="146" Column="1" TopLine="133"/>
     397        <Filename Value="bgrabitmap/bgradefaultbitmap.pas"/>
     398        <Caret Line="215" Column="27" TopLine="202"/>
    417399      </Position15>
    418400      <Position16>
    419401        <Filename Value="bgrabitmap/bgradefaultbitmap.pas"/>
    420         <Caret Line="1069" Column="1" TopLine="1048"/>
     402        <Caret Line="299" Column="31" TopLine="281"/>
    421403      </Position16>
    422404      <Position17>
    423405        <Filename Value="bgrabitmap/bgradefaultbitmap.pas"/>
    424         <Caret Line="1055" Column="25" TopLine="1048"/>
     406        <Caret Line="290" Column="39" TopLine="287"/>
    425407      </Position17>
    426408      <Position18>
    427         <Filename Value="bgrabitmap/bgradefaultbitmap.pas"/>
    428         <Caret Line="215" Column="27" TopLine="202"/>
     409        <Filename Value="UDrawMethod.pas"/>
     410        <Caret Line="146" Column="19" TopLine="133"/>
    429411      </Position18>
    430412      <Position19>
    431         <Filename Value="bgrabitmap/bgradefaultbitmap.pas"/>
    432         <Caret Line="299" Column="31" TopLine="281"/>
     413        <Filename Value="UDrawMethod.pas"/>
     414        <Caret Line="133" Column="33" TopLine="121"/>
    433415      </Position19>
    434416      <Position20>
    435417        <Filename Value="bgrabitmap/bgradefaultbitmap.pas"/>
    436         <Caret Line="290" Column="39" TopLine="287"/>
     418        <Caret Line="292" Column="57" TopLine="279"/>
    437419      </Position20>
    438420      <Position21>
    439         <Filename Value="UDrawMethod.pas"/>
    440         <Caret Line="146" Column="19" TopLine="133"/>
     421        <Filename Value="bgrabitmap/bgradefaultbitmap.pas"/>
     422        <Caret Line="420" Column="26" TopLine="413"/>
    441423      </Position21>
    442424      <Position22>
    443         <Filename Value="../../../Projekty2/FreePascalManager/trunk/Instance/1/Lazarus/lcl/graphics.pp"/>
    444         <Caret Line="1327" Column="31" TopLine="1314"/>
     425        <Filename Value="bgrabitmap/bgradefaultbitmap.pas"/>
     426        <Caret Line="407" Column="3" TopLine="405"/>
    445427      </Position22>
    446       <Position23>
    447         <Filename Value="../../../Projekty2/FreePascalManager/trunk/Instance/1/Lazarus/lcl/graphtype.pp"/>
    448         <Caret Line="189" Column="25" TopLine="187"/>
    449       </Position23>
    450       <Position24>
    451         <Filename Value="../../../Projekty2/FreePascalManager/trunk/Instance/1/Lazarus/lcl/graphtype.pp"/>
    452         <Caret Line="5" Column="65" TopLine="1"/>
    453       </Position24>
    454       <Position25>
    455         <Filename Value="../../../Projekty2/FreePascalManager/trunk/Instance/1/Lazarus/lcl/graphtype.pp"/>
    456         <Caret Line="274" Column="23" TopLine="253"/>
    457       </Position25>
    458       <Position26>
    459         <Filename Value="../../../Projekty2/FreePascalManager/trunk/Instance/1/Lazarus/lcl/graphtype.pp"/>
    460         <Caret Line="289" Column="26" TopLine="268"/>
    461       </Position26>
    462       <Position27>
    463         <Filename Value="UDrawMethod.pas"/>
    464         <Caret Line="133" Column="33" TopLine="121"/>
    465       </Position27>
    466       <Position28>
    467         <Filename Value="bgrabitmap/bgradefaultbitmap.pas"/>
    468         <Caret Line="292" Column="57" TopLine="279"/>
    469       </Position28>
    470       <Position29>
    471         <Filename Value="bgrabitmap/bgradefaultbitmap.pas"/>
    472         <Caret Line="420" Column="26" TopLine="413"/>
    473       </Position29>
    474       <Position30>
    475         <Filename Value="bgrabitmap/bgradefaultbitmap.pas"/>
    476         <Caret Line="407" Column="3" TopLine="405"/>
    477       </Position30>
    478428    </JumpHistory>
    479429  </ProjectOptions>

  • GraphicTest/UDrawMethod.pas

    r206 r210  
    133133    P := PInteger(BGRABitmap.ScanLine[Y]);
    134134    for X := 0 to Size.X - 1 do begin
    135       P^ := NoSwapBRComponent(Pixels[X, Y]);
     135      P^ := NoSwapBRComponent(Pixels[X, Y]) or $ff000000;
    136136      (*P^.red := Pixels[X, Y];
    137137      P^.green := Pixels[X, Y];
    … …  
    141141    end;
    142142  end;
    143   //BGRABitmap.InvalidateBitmap; // changed by direct access
     143  BGRABitmap.InvalidateBitmap; // changed by direct access
    144144  //BGRABitmap.Draw(Bitmap.Canvas, 0, 0, True);
    145145  BGRABitmap.Draw(PaintBox.Canvas, 0, 0, True);
Note: See TracChangeset for help on using the changeset viewer.