Fixed Demo 29

Author: pyscripter

Demos/Demo29/Unit1.dfm

@@ -2,7 +2,7 @@ object Form1: TForm1
  Left = 218
  Top = 18
  Caption = 'Form1'
- ClientHeight = 809
+ ClientHeight = 701
  ClientWidth = 668
  Color = clBtnFace
  Font.Charset = DEFAULT_CHARSET
@@ -11,6 +11,9 @@ object Form1: TForm1
  Font.Name = 'MS Sans Serif'
  Font.Style = []
  OldCreateOrder = False
+ DesignSize = (
+ 668
+ 701)
  PixelsPerInch = 96
  TextHeight = 13
  object Image1: TImage
@@ -39,10 +42,11 @@ object Form1: TForm1
  OnClick = Button2Click
  end
  object Memo1: TMemo
- Left = 8
- Top = 471
- Width = 657
- Height = 330
+ Left = 0
+ Top = 472
+ Width = 668
+ Height = 229
+ Align = alBottom
  Font.Charset = DEFAULT_CHARSET
  Font.Color = clWindowText
  Font.Height = -13
@@ -69,20 +73,23 @@ object Form1: TForm1
  ' new_im.format = im.format'
  ' return new_im'
  ' '
- 'def ImageToString(image):'
+ 'def ImageToBytes(image):'
  ' stream = BytesIO()'
  ' image.save(stream, image.format)'
  ' return stream.getvalue()')
  ParentFont = False
  ScrollBars = ssBoth
  TabOrder = 2
  WordWrap = False
+ ExplicitLeft = 16
+ ExplicitTop = 352
  end
  object Memo2: TMemo
  Left = 8
  Top = 352
  Width = 657
- Height = 113
+ Height = 114
+ Anchors = [akLeft, akTop, akRight]
  Font.Charset = DEFAULT_CHARSET
  Font.Color = clWindowText
  Font.Height = -13

Demos/Demo29/Unit1.pas

@@ -43,41 +43,17 @@ implementation
 
 {$R *.dfm}
 
-// Old code not compatible with Unicode
-//
-//function ImageToString(AGraphic : TGraphic) : String;
-//var
-// _stream : TStringStream;
-//begin
-// _stream := TStringStream.Create('');
-// try
-// AGraphic.SaveToStream(_stream);
-// Result := _stream.DataString;
-// finally
-// _stream.Free;
-// end;
-//end;
-//
-//function BinStrToPyStr(const AString : String) : Variant;
-//var
-// _str : PPyObject;
-//begin
-// _str := GetPythonEngine.PyString_FromStringAndSize(PAnsiChar(AString), Length(AString)*SizeOf(Char));
-// Result := VarPythonCreate(_str);
-// GetPythonEngine.Py_DECREF(_str);
-//end;
-
-function ImageToPyStr(AGraphic : TGraphic) : Variant;
+function ImageToPyBytes(AGraphic : TGraphic) : Variant;
 var
  _stream : TMemoryStream;
- _str : PPyObject;
+ _bytes : PPyObject;
 begin
  _stream := TMemoryStream.Create();
  try
  AGraphic.SaveToStream(_stream);
- _str := GetPythonEngine.PyString_FromStringAndSize(_stream.Memory, _stream.Size);
- Result := VarPythonCreate(_str);
- GetPythonEngine.Py_DECREF(_str);
+ _bytes := GetPythonEngine.PyBytes_FromStringAndSize(_stream.Memory, _stream.Size);
+ Result := VarPythonCreate(_bytes);
+ GetPythonEngine.Py_DECREF(_bytes);
  finally
  _stream.Free;
  end;
@@ -102,17 +78,17 @@ procedure TForm1.Button2Click(Sender: TObject);
  if (Image1.Picture.Graphic = nil) or Image1.Picture.Graphic.Empty then
  raise Exception.Create('You must first select an image');
  PythonEngine1.ExecStrings(Memo1.Lines);
- _im := MainModule.ProcessImage(ImageToPyStr(Image1.Picture.Graphic));
+ _im := MainModule.ProcessImage(ImageToPyBytes(Image1.Picture.Graphic));
  if not chkUseDC.Checked then
  begin
  // We have to call PyString_AsStringAndSize because the image may contain zeros
  with GetPythonEngine do begin
  pargs := MakePyTuple([ExtractPythonObjectFrom(_im)]);
  try
+ presult := PyEval_CallObjectWithKeywords(
+ ExtractPythonObjectFrom(MainModule.ImageToBytes), pargs, nil);
  try
- presult := PyEval_CallObjectWithKeywords(
- ExtractPythonObjectFrom(MainModule.ImageToString), pargs, nil);
- if (PyString_AsStringAndSize(presult, P, Len) < 0) or (P = nil) then begin
+ if (P = nil) or (PyBytes_AsStringAndSize(presult, P, Len) < 0) then begin
  ShowMessage('This does not work and needs fixing');
  Abort;
  end;